David S. Miller 71a83a6db6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/rocker/rocker.c The rocker commit was two overlapping changes, one to rename the ->vport member to ->pport, and another making the bitmask expression use '1ULL' instead of plain '1'. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-03-03 21:16:48 -05:00
..
.gitignore	wireless: support internal statically compiled regulatory database	2009-12-21 18:56:10 -05:00
ap.c	cfg80211: export interface stopping function	2014-05-06 15:16:34 +02:00
chan.c	cfg80211: Fix 160 MHz channels with 80+80 and 160 MHz drivers	2014-12-12 12:18:47 +01:00
core.c	cfg80211: calls nl80211_exit on error	2015-02-24 11:41:21 +01:00
core.h	nl80211: Stop scheduled scan if netlink client disappears	2014-12-18 14:38:44 +01:00
db.txt	wireless: support internal statically compiled regulatory database	2009-12-21 18:56:10 -05:00
debugfs.c	mac80211: fix some snprintf misuses	2013-10-01 12:16:51 +02:00
debugfs.h	cfg80211/mac80211: use debugfs_remove_recursive	2009-10-30 16:49:18 -04:00
ethtool.c	cfg80211: make ethtool the driver's responsibility	2014-06-23 11:05:33 +02:00
genregdb.awk	wireless: fixup genregdb.awk for remove of antenna gain from wireless-regd	2014-07-21 12:24:20 +02:00
ibss.c	wireless: Use eth_<foo>_addr instead of memset	2015-03-03 17:01:38 -05:00
Kconfig	Revert "cfg80211: make WEXT compatibility unselectable"	2014-12-30 16:42:29 -08:00
lib80211_crypt_ccmp.c	hostap: Don't use create_proc_read_entry()	2013-04-29 15:41:56 -04:00
lib80211_crypt_tkip.c	hostap: Don't use create_proc_read_entry()	2013-04-29 15:41:56 -04:00
lib80211_crypt_wep.c	hostap: Don't use create_proc_read_entry()	2013-04-29 15:41:56 -04:00
lib80211.c	lib80211: remove unused print_ssid()	2014-10-14 02:18:27 +02:00
Makefile	cfg80211: 802.11p OCB mode handling	2014-11-04 13:18:17 +01:00
mesh.c	cfg80211: export interface stopping function	2014-05-06 15:16:34 +02:00
mlme.c	cfg80211/mac80211: add wmm info to assoc event	2014-09-11 12:24:39 +02:00
nl80211.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-03-03 21:16:48 -05:00
nl80211.h	cfg80211: allow wiphy specific regdomain management	2014-12-17 11:49:55 +01:00
ocb.c	cfg80211: 802.11p OCB mode handling	2014-11-04 13:18:17 +01:00
radiotap.c	radiotap: fix bitmap-end-finding buffer overrun	2013-12-16 12:06:43 +01:00
rdev-ops.h	cfg80211: introduce TDLS channel switch commands	2014-11-19 18:45:12 +01:00
reg.c	cfg80211: fix n_reg_rules to match world_regdom	2015-02-24 10:58:37 +01:00
reg.h	cfg80211: allow usermode to query wiphy specific regdom	2014-12-17 11:49:55 +01:00
regdb.h	cfg80211: relicense reg.c reg.h and genregdb.awk to ISC	2012-01-04 14:30:41 -05:00
scan.c	nl80211: Convert sched_scan_req pointer to RCU pointer	2014-12-18 14:38:09 +01:00
sme.c	cfg80211: set the rates mask in connection probes over specified freq	2014-10-10 17:11:13 +02:00
sysfs.c	net: wireless: convert class code to use dev_groups	2013-07-25 16:34:40 -07:00
sysfs.h	net: misc: Remove extern from function prototypes	2013-10-19 19:12:11 -04:00
trace.c	cfg80211: add tracing to rdev-ops	2012-10-18 10:53:37 +02:00
trace.h	wireless: Use eth_<foo>_addr instead of memset	2015-03-03 17:01:38 -05:00
util.c	Last round of updates for net-next:	2015-02-04 14:57:45 -08:00
wext-compat.c	cfg80211: remove enum station_info_flags	2015-01-08 15:28:10 +01:00
wext-compat.h	cfg80211: remove unused wiphy argument from cfg80211_wext_freq()	2014-04-10 10:06:19 +02:00
wext-core.c	wext: include wireless event id when it has a size problem	2012-09-05 16:12:44 +02:00
wext-priv.c	wext: fix potential private ioctl memory content leak	2010-09-20 13:41:40 -04:00
wext-proc.c	net: proc: change proc_net_remove to remove_proc_entry	2013-02-18 14:53:08 -05:00
wext-sme.c	wireless: Use eth_<foo>_addr instead of memset	2015-03-03 17:01:38 -05:00
wext-spy.c	wireless: Convert compare_ether_addr to ether_addr_equal	2012-05-09 20:49:19 -04:00