diff options
| author | David S. Miller <davem@davemloft.net> | 2015-05-31 17:34:26 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-05-31 17:34:26 -0700 |
| commit | d80373146261326eb207cf98bbdbe33c8c569134 (patch) | |
| tree | ce6c92e81dab53cf51767ebfdaebcd4f8ace2860 /include/net | |
| parent | a9ab2184f451ec78af245ebb8b663d8700d44672 (diff) | |
| parent | f7959e9c73200f2ae361d0d311aa501f2c6a05c7 (diff) | |
| download | op-kernel-dev-d80373146261326eb207cf98bbdbe33c8c569134.zip op-kernel-dev-d80373146261326eb207cf98bbdbe33c8c569134.tar.gz | |
Merge tag 'mac80211-next-for-davem-2015-05-29' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Johannes Berg says:
====================
As we get closer to the merge window, here are a few
more things for -next:
* disconnect TDLS stations on CSA to avoid issues
* fix a memory leak introduced in a recent commit
* switch rfkill and cfg80211 to PM ops
* in an unlikely scenario, prevent a bookkeeping
value to get corrupted leading to dropped packets
* fix a crash in VLAN assignment
* switch rfkill-gpio to more modern gpiod API
* send disconnected event to userspace with proper
local/remote indication
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/cfg80211.h | 4 | ||||
| -rw-r--r-- | include/net/mac80211.h | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index d63ecec..a741678 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h @@ -4575,13 +4575,15 @@ void cfg80211_roamed_bss(struct net_device *dev, struct cfg80211_bss *bss, * @ie: information elements of the deauth/disassoc frame (may be %NULL) * @ie_len: length of IEs * @reason: reason code for the disconnection, set it to 0 if unknown + * @locally_generated: disconnection was requested locally * @gfp: allocation flags * * After it calls this function, the driver should enter an idle state * and not try to connect to any AP any more. */ void cfg80211_disconnected(struct net_device *dev, u16 reason, - const u8 *ie, size_t ie_len, gfp_t gfp); + const u8 *ie, size_t ie_len, + bool locally_generated, gfp_t gfp); /** * cfg80211_ready_on_channel - notification of remain_on_channel start diff --git a/include/net/mac80211.h b/include/net/mac80211.h index 2f8b7de..887fe95 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h @@ -1728,8 +1728,7 @@ struct ieee80211_tx_control { * @sta: station table entry, %NULL for per-vif queue * @tid: the TID for this queue (unused for per-vif queue) * @ac: the AC for this queue - * @drv_priv: data area for driver use, will always be aligned to - * sizeof(void *). + * @drv_priv: driver private area, sized by hw->txq_data_size * * The driver can obtain packets from this queue by calling * ieee80211_tx_dequeue(). |
