diff options
| author | David S. Miller <davem@davemloft.net> | 2012-10-21 20:57:37 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-10-21 20:57:37 -0400 |
| commit | e6e71054cd9f98c8ebb3a5f66f2776a9736afc87 (patch) | |
| tree | bdbfa01832b970f550170fd2a28042e3def18d85 /include | |
| parent | 9a4da2cd99e4edfee1e48c5e2b4928eaefb56006 (diff) | |
| parent | 06f40a41b80e25e88a2b612ea3b2a94f93c94f72 (diff) | |
| download | linux-e6e71054cd9f98c8ebb3a5f66f2776a9736afc87.tar.gz linux-e6e71054cd9f98c8ebb3a5f66f2776a9736afc87.tar.bz2 linux-e6e71054cd9f98c8ebb3a5f66f2776a9736afc87.zip | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
John W. Linville says:
====================
This is a batch of fixes intended for the 3.7 stream.
Dan Carpenter brings a fix for a simple signedness bug that could
prevent the proper termination of a loop.
Felix Fietkau found a few more places that need to use
ieee80211_free_txskb for properly releasing SKBs used by mac80211.
Franky Lin offers a pair of brcmfmac fixes, both fixing simple state
reporting errors.
Hante Meuleman corrects an error reporting case that wasn't handling
all types of errors properly.
Johan Hedberg offers a fix for an issue discovered at the Bluetooth
UnPlug Fest. Gustavo says "the patch fixes a failure to pair with
devices that support the LE Secure Connections feature."
Johannes Berg sends an iwlwifi fix to handle a message type that
is too large for the normal command mechanism. He also provides a
mac80211 fix to use HT20 channels when HT40 channels are not permitted.
Jouni Malinen offers a mac80211 fix for a masking error that was
incorrectly marking some frames.
Piotr Haber provides a fix to make sure bcma devices are unregistered
properly.
Stanislav Yakovlev gives us a fix for a panic in the ipw2200 driver.
Stanislaw Gruszka sends a pair of fixes: one prevents a mismatch on
connection states between cfg80211 and mac80211; the other prevents
some frame corruption related to handling encryption.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/cfg80211.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index 1b4989082244..f8cd4cf3fad8 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h @@ -1218,6 +1218,7 @@ struct cfg80211_deauth_request { const u8 *ie; size_t ie_len; u16 reason_code; + bool local_state_change; }; /** |