diff options
| author | John W. Linville | 2012-10-23 17:41:46 +0200 |
|---|---|---|
| committer | John W. Linville | 2012-10-23 17:41:46 +0200 |
| commit | 9b34f40c20111ba658f88e1669598db494be1fbc (patch) | |
| tree | be98189b178ca63a44c09c8a5e92574a92932b51 /include/net/cfg80211.h | |
| parent | brcm80211: remove some truely barftastic code (diff) | |
| parent | Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber... (diff) | |
| download | kernel-qcow2-linux-9b34f40c20111ba658f88e1669598db494be1fbc.tar.gz kernel-qcow2-linux-9b34f40c20111ba658f88e1669598db494be1fbc.tar.xz kernel-qcow2-linux-9b34f40c20111ba658f88e1669598db494be1fbc.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts:
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
net/mac80211/mlme.c
Diffstat (limited to 'include/net/cfg80211.h')
| -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 aa0e4a12308c..86583ce97b1b 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h @@ -1232,6 +1232,7 @@ struct cfg80211_deauth_request { const u8 *ie; size_t ie_len; u16 reason_code; + bool local_state_change; }; /** |