Johannes Berg 1e1430d528 Merge remote-tracking branch 'net-next/master' into mac80211-next ... Resolve the merge conflict between Felix's/my and Toke's patches coming into the tree through net and mac80211-next respectively. Most of Felix's changes go away due to Toke's new infrastructure work, my patch changes to "goto begin" (the label wasn't there before) instead of returning NULL so flow control towards drivers is preserved better. Signed-off-by: Johannes Berg <johannes.berg@intel.com>		2016-10-04 09:46:44 +02:00
..
.gitignore	…
Kconfig	…
Makefile	…
ap.c	…
chan.c	cfg80211: add start / stop NAN commands	2016-09-30 13:21:14 +02:00
core.c	cfg80211: add add_nan_func / del_nan_func	2016-09-30 13:21:23 +02:00
core.h	cfg80211: add start / stop NAN commands	2016-09-30 13:21:14 +02:00
db.txt	…
debugfs.c	…
debugfs.h	…
ethtool.c	…
genregdb.awk	…
ibss.c	cfg80211: Add support for static WEP in the driver	2016-09-30 13:19:10 +02:00
lib80211.c	…
lib80211_crypt_ccmp.c	…
lib80211_crypt_tkip.c	…
lib80211_crypt_wep.c	…
mesh.c	…
mlme.c	cfg80211: add start / stop NAN commands	2016-09-30 13:21:14 +02:00
nl80211.c	Merge remote-tracking branch 'net-next/master' into mac80211-next	2016-10-04 09:46:44 +02:00
nl80211.h	cfg80211: always notify userspace of new wireless netdevs	2016-08-11 16:51:41 +02:00
ocb.c	…
radiotap.c	…
rdev-ops.h	cfg80211: allow the user space to change current NAN configuration	2016-09-30 13:21:28 +02:00
reg.c	…
reg.h	…
regdb.h	…
scan.c	cfg80211: add helper to find an IE that matches a byte-array	2016-09-16 14:49:52 +02:00
sme.c	cfg80211: Add support for static WEP in the driver	2016-09-30 13:19:10 +02:00
sysfs.c	cfg80211: remove unnecessary pointer-of	2016-09-15 16:46:20 +02:00
sysfs.h	…
trace.c	…
trace.h	cfg80211: allow the user space to change current NAN configuration	2016-09-30 13:21:28 +02:00
util.c	cfg80211: add add_nan_func / del_nan_func	2016-09-30 13:21:23 +02:00
wext-compat.c	cfg80211: Add support for static WEP in the driver	2016-09-30 13:19:10 +02:00
wext-compat.h	…
wext-core.c	Revert "wext: Fix 32 bit iwpriv compatibility issue with 64 bit Kernel"	2016-08-08 08:49:50 +02:00
wext-priv.c	…
wext-proc.c	…
wext-sme.c	cfg80211: Add support for static WEP in the driver	2016-09-30 13:19:10 +02:00
wext-spy.c	…