Date: Tue, 19 May 2009 15:53:07 +0000 (UTC) From: Rui Paulo <rpaulo@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r192389 - projects/mesh11s/sys/net80211 Message-ID: <200905191553.n4JFr7hG002460@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rpaulo Date: Tue May 19 15:53:07 2009 New Revision: 192389 URL: http://svn.freebsd.org/changeset/base/192389 Log: Remove the bogus decrease of datalen and pad meshcntl struct instead. This is a temporary hack but makes packets flow in the mesh. Sponsored by: The FreeBSD Foundation Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.h projects/mesh11s/sys/net80211/ieee80211_output.c Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.h ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_mesh.h Tue May 19 15:50:36 2009 (r192388) +++ projects/mesh11s/sys/net80211/ieee80211_mesh.h Tue May 19 15:53:07 2009 (r192389) @@ -316,6 +316,7 @@ struct ieee80211_meshcntl { uint8_t mc_flags; uint8_t mc_ttl; uint32_t mc_seq; + uint16_t _pad; /* more mesh addresses follow */ } __packed; Modified: projects/mesh11s/sys/net80211/ieee80211_output.c ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_output.c Tue May 19 15:50:36 2009 (r192388) +++ projects/mesh11s/sys/net80211/ieee80211_output.c Tue May 19 15:53:07 2009 (r192389) @@ -1331,7 +1331,7 @@ ieee80211_encap(struct ieee80211vap *vap goto bad; } datalen = m->m_pkthdr.len; /* NB: w/o 802.11 header */ - hdrspace -= 2; + M_PREPEND(m, hdrspace, M_DONTWAIT); if (m == NULL) { vap->iv_stats.is_tx_nobuf++;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200905191553.n4JFr7hG002460>