diff options
| author | David S. Miller <davem@davemloft.net> | 2015-12-16 18:33:38 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-12-16 18:33:38 -0500 |
| commit | 4d4f37910b8a120e9cf5a436256db84295437ac7 (patch) | |
| tree | a197af9b3f0eaaee43b8e268640178ae9d41a350 /net/mac80211/rx.c | |
| parent | 79aa05a24f01bcb0cfbac3deea4f12d9b4f64ba9 (diff) | |
| parent | cf1e05c63642ce65821a6277adfc2157f7334c9d (diff) | |
Merge tag 'mac80211-for-davem-2015-12-15' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Johannes Berg says:
====================
Another set of fixes:
* memory leak fixes (from Ola)
* operating mode notification spec compliance fix (from Eyal)
* copy rfkill names in case pointer becomes invalid (myself)
* two hardware restart fixes (myself)
* get rid of "limiting TX power" log spam (myself)
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac80211/rx.c')
| -rw-r--r-- | net/mac80211/rx.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index 8bae5de0dc44..82af407fea7a 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -2736,8 +2736,7 @@ ieee80211_rx_h_action(struct ieee80211_rx_data *rx) opmode = mgmt->u.action.u.vht_opmode_notif.operating_mode; ieee80211_vht_handle_opmode(rx->sdata, rx->sta, - opmode, status->band, - false); + opmode, status->band); goto handled; } default: |