diff options
| author |   David S. Miller <davem@davemloft.net> | 2016-07-06 22:32:15 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-07-06 22:32:15 -0700 |
| commit | a90a6e55f34f28190e4dc2a6a3660ef157827a8f (patch) | |
| tree | 9bd13d11e4a857bef0a2ea24bece7f6de981b52c /net/mac80211/tdls.c | |
| parent | net: mediatek: remove .owner field for driver (diff) | |
| parent | cfg80211: Add mesh peer AID setting API (diff) | |
| download | linux-dev-a90a6e55f34f28190e4dc2a6a3660ef157827a8f.tar.xz linux-dev-a90a6e55f34f28190e4dc2a6a3660ef157827a8f.zip | |
Merge tag 'mac80211-next-for-davem-2016-07-06' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Johannes Berg says:
====================
One more set of new features:
* beacon report (for radio measurement) support in cfg80211/mac80211
* hwsim: allow wmediumd in namespaces
* mac80211: extend 160MHz workaround to CSA IEs
* mesh: properly encrypt group-addressed privacy action frames
* mesh: allow setting peer AID
* first steps for MU-MIMO monitor mode
* along with various other cleanups and improvements
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac80211/tdls.c')
| -rw-r--r-- | net/mac80211/tdls.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/mac80211/tdls.c b/net/mac80211/tdls.c index 1c7d45a6d93e..b5d28f14b9cf 100644 --- a/net/mac80211/tdls.c +++ b/net/mac80211/tdls.c @@ -1747,6 +1747,7 @@ ieee80211_process_tdls_channel_switch_resp(struct ieee80211_sub_if_data *sdata, goto out; } + ret = 0; call_drv: drv_tdls_recv_channel_switch(sdata->local, sdata, ¶ms); |