diff options
author | David S. Miller <davem@davemloft.net> | 2010-02-10 15:35:24 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-02-10 15:35:24 -0500 |
commit | 044c18c9f51a2b92b310e28bb121e55451b088dd (patch) | |
tree | b57fb7cd9dc33412d6811b734664e90be26418c7 /net/mac80211/ibss.c | |
parent | 3f2e8d9f13246382fbda6f03178eef867a9bfbe2 (diff) | |
parent | 174b24963eaf96dc5e093502ee09639aed13eb2f (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net/mac80211/ibss.c')
-rw-r--r-- | net/mac80211/ibss.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c index 1f2db647bb5c..22f0c2aa7a89 100644 --- a/net/mac80211/ibss.c +++ b/net/mac80211/ibss.c | |||
@@ -647,7 +647,7 @@ static void ieee80211_rx_mgmt_probe_req(struct ieee80211_sub_if_data *sdata, | |||
647 | } | 647 | } |
648 | if (pos[1] != 0 && | 648 | if (pos[1] != 0 && |
649 | (pos[1] != ifibss->ssid_len || | 649 | (pos[1] != ifibss->ssid_len || |
650 | !memcmp(pos + 2, ifibss->ssid, ifibss->ssid_len))) { | 650 | memcmp(pos + 2, ifibss->ssid, ifibss->ssid_len))) { |
651 | /* Ignore ProbeReq for foreign SSID */ | 651 | /* Ignore ProbeReq for foreign SSID */ |
652 | return; | 652 | return; |
653 | } | 653 | } |