diff options
| author | John W. Linville | 2010-02-08 22:38:38 +0100 |
|---|---|---|
| committer | John W. Linville | 2010-02-08 22:38:38 +0100 |
| commit | 6e7e6213e4956828927c30e3ef5a42812d00c650 (patch) | |
| tree | 3e13859aae5ac0a50eecd452e96849e5e373f444 /net/mac80211/ibss.c | |
| parent | ath9k: add support for 802.11n bonded out AR2427 (diff) | |
| parent | mac80211: fix deferred hardware scan requests (diff) | |
| download | kernel-qcow2-linux-6e7e6213e4956828927c30e3ef5a42812d00c650.tar.gz kernel-qcow2-linux-6e7e6213e4956828927c30e3ef5a42812d00c650.tar.xz kernel-qcow2-linux-6e7e6213e4956828927c30e3ef5a42812d00c650.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Conflicts:
net/mac80211/scan.c
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 f95750b423e3..85c4ba14c77d 100644 --- a/net/mac80211/ibss.c +++ b/net/mac80211/ibss.c @@ -652,7 +652,7 @@ static void ieee80211_rx_mgmt_probe_req(struct ieee80211_sub_if_data *sdata, } if (pos[1] != 0 && (pos[1] != ifibss->ssid_len || - !memcmp(pos + 2, ifibss->ssid, ifibss->ssid_len))) { + memcmp(pos + 2, ifibss->ssid, ifibss->ssid_len))) { /* Ignore ProbeReq for foreign SSID */ return; } |