diff options
author | John W. Linville <linville@tuxdriver.com> | 2013-08-28 17:51:40 (GMT) |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2013-08-28 17:51:40 (GMT) |
commit | f3e979a52c554f45e4ca6f01ca6933acef34b872 (patch) | |
tree | 53aa9e61aa7fd0c225528fba4144b2d15f709ad9 /drivers/net/wireless/mwifiex | |
parent | cd80e107b741f9e05c53a01e5cbe2cdf4b6074bc (diff) | |
parent | a98655387762394371b88cdfb8215884757978ab (diff) | |
download | linux-f3e979a52c554f45e4ca6f01ca6933acef34b872.tar.xz |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Diffstat (limited to 'drivers/net/wireless/mwifiex')
-rw-r--r-- | drivers/net/wireless/mwifiex/util.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/mwifiex/util.c b/drivers/net/wireless/mwifiex/util.c index e57ac0d..5d9e150 100644 --- a/drivers/net/wireless/mwifiex/util.c +++ b/drivers/net/wireless/mwifiex/util.c @@ -171,8 +171,8 @@ mwifiex_process_mgmt_packet(struct mwifiex_private *priv, rx_pd->rx_pkt_length = cpu_to_le16(pkt_len); cfg80211_rx_mgmt(priv->wdev, priv->roc_cfg.chan.center_freq, - CAL_RSSI(rx_pd->snr, rx_pd->nf), - skb->data, pkt_len, GFP_ATOMIC); + CAL_RSSI(rx_pd->snr, rx_pd->nf), skb->data, pkt_len, + 0, GFP_ATOMIC); return 0; } |