diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-07-25 22:48:01 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-07-25 22:48:01 +0200 |
| commit | 9d55911e8f14fad6d6fc95bf6db7af5af2d808c6 (patch) | |
| tree | 4c59f917d2e3c3cfa62c2a3ce77c1c2be04f708e /drivers/net/wireless/cw1200 | |
| parent | bgmac: make bgmac depend on bcm47xx (diff) | |
| parent | brcmfmac: bail out of brcmf_txflowblock_if() for non-netdev interface (diff) | |
| download | linux-9d55911e8f14fad6d6fc95bf6db7af5af2d808c6.tar.xz linux-9d55911e8f14fad6d6fc95bf6db7af5af2d808c6.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'drivers/net/wireless/cw1200')
| -rw-r--r-- | drivers/net/wireless/cw1200/txrx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/cw1200/txrx.c b/drivers/net/wireless/cw1200/txrx.c index 5862c373d714..e824d4d4a18d 100644 --- a/drivers/net/wireless/cw1200/txrx.c +++ b/drivers/net/wireless/cw1200/txrx.c @@ -1165,7 +1165,7 @@ void cw1200_rx_cb(struct cw1200_common *priv, if (cw1200_handle_action_rx(priv, skb)) return; } else if (ieee80211_is_beacon(frame->frame_control) && - !arg->status && + !arg->status && priv->vif && !memcmp(ieee80211_get_SA(frame), priv->vif->bss_conf.bssid, ETH_ALEN)) { const u8 *tim_ie; |