diff options
| author | David S. Miller <davem@davemloft.net> | 2010-09-21 18:17:19 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-09-21 18:17:19 -0700 |
| commit | a0741ca949692904646c310573754859cba09bf1 (patch) | |
| tree | fc95067d8bfee5f6c6c747c74d1d6547d70199a3 /net/wireless/mlme.c | |
| parent | 9e2e8f14d48dbb6c31aeb739ae4fc8997b9dfe84 (diff) | |
| parent | b618f6f885579a6237e5bf4582fa6167972ddef4 (diff) | |
| download | op-kernel-dev-a0741ca949692904646c310573754859cba09bf1.zip op-kernel-dev-a0741ca949692904646c310573754859cba09bf1.tar.gz | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'net/wireless/mlme.c')
| -rw-r--r-- | net/wireless/mlme.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/wireless/mlme.c b/net/wireless/mlme.c index 8515b1e..46f3711 100644 --- a/net/wireless/mlme.c +++ b/net/wireless/mlme.c @@ -882,7 +882,8 @@ int cfg80211_mlme_mgmt_tx(struct cfg80211_registered_device *rdev, if (!wdev->current_bss || memcmp(wdev->current_bss->pub.bssid, mgmt->bssid, ETH_ALEN) != 0 || - (wdev->iftype == NL80211_IFTYPE_STATION && + ((wdev->iftype == NL80211_IFTYPE_STATION || + wdev->iftype == NL80211_IFTYPE_P2P_CLIENT) && memcmp(wdev->current_bss->pub.bssid, mgmt->da, ETH_ALEN) != 0)) { wdev_unlock(wdev); |
