Date: Thu, 22 Sep 2011 03:03:40 +0000 (UTC) From: Adrian Chadd <adrian@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r225723 - user/adrian/if_ath_tx/sys/net80211 Message-ID: <201109220303.p8M33eei002808@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adrian Date: Thu Sep 22 03:03:40 2011 New Revision: 225723 URL: http://svn.freebsd.org/changeset/base/225723 Log: Remove an unneeded check; tidy it up a bit, add comments about where things may still go pear-shaped. Modified: user/adrian/if_ath_tx/sys/net80211/ieee80211_sta.c Modified: user/adrian/if_ath_tx/sys/net80211/ieee80211_sta.c ============================================================================== --- user/adrian/if_ath_tx/sys/net80211/ieee80211_sta.c Thu Sep 22 02:07:29 2011 (r225722) +++ user/adrian/if_ath_tx/sys/net80211/ieee80211_sta.c Thu Sep 22 03:03:40 2011 (r225723) @@ -592,10 +592,15 @@ sta_input(struct ieee80211_node *ni, str * * If we receive a data frame that isn't * destined to our VAP MAC, drop it. + * + * XXX TODO: This is only enforced when not scanning; + * XXX it assumes a software-driven scan will put the NIC + * XXX into a "no data frames" mode before setting this + * XXX flag. Otherwise it may be possible that we'll still + * XXX process data frames whilst scanning. */ - if (ni == vap->iv_bss - && (!(IEEE80211_IS_MULTICAST(wh->i_addr1))) - && (!IEEE80211_ADDR_EQ(wh->i_addr1, IF_LLADDR(ifp)))) { + if ((! IEEE80211_IS_MULTICAST(wh->i_addr1)) + && (! IEEE80211_ADDR_EQ(wh->i_addr1, IF_LLADDR(ifp)))) { IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT, bssid, NULL, "not to cur sta: lladdr=%6D, addr1=%6D", IF_LLADDR(ifp), ":", wh->i_addr1, ":");
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201109220303.p8M33eei002808>