/include/net/9p/

'http:///git.distanz.ch/cgit.cgi/linux/net-next.git' title='net-next.git Git repository'/>
summaryrefslogtreecommitdiff
path: root/net/wireless
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2017-02-10 14:31:51 -0500
committerDavid S. Miller <davem@davemloft.net>2017-02-10 14:31:51 -0500
commit0d2164af2696821b27b04bebd8420b0e881bf44d (patch)
tree3da988896640ff47a47d7d1c5a6407a902c184e2 /net/wireless
parent1deeaa0b86973bef6629396cc0f5f092872bb6de (diff)
parentf181d6a3bcc35633facf5f3925699021c13492c5 (diff)
Merge tag 'mac80211-next-for-davem-2017-02-09' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Johannes Berg says: ==================== Some more updates: * use shash in mac80211 crypto code where applicable * some documentation fixes * pass RSSI levels up in change notifications * remove unused rfkill-regulator * various other cleanups ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/wireless')
-rw-r--r--net/wireless/core.c3
-rw-r--r--net/wireless/debugfs.c10
-rw-r--r--net/wireless/nl80211.c114
-rw-r--r--net/wireless/trace.h27
4 files changed, 114 insertions, 40 deletions
diff --git a/net/wireless/core.c b/net/wireless/core.c