David S. Miller 56a4342dfe Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c net/ipv6/ip6_tunnel.c net/ipv6/ip6_vti.c ipv6 tunnel statistic bug fixes conflicting with consolidation into generic sw per-cpu net stats. qlogic conflict between queue counting bug fix and the addition of multiple MAC address support. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-01-06 17:37:45 -05:00
..
.gitignore	wireless: support internal statically compiled regulatory database	2009-12-21 18:56:10 -05:00
ap.c	cfg80211: move exported event functions into nl80211	2013-03-06 16:35:46 +01:00
chan.c	cfg80211: allow beaconing after DFS CAC	2013-11-25 20:50:49 +01:00
core.c	Merge remote-tracking branch 'wireless-next/master' into mac80211-next	2013-12-16 11:23:45 +01:00
core.h	Merge remote-tracking branch 'wireless-next/master' into mac80211-next	2013-12-16 11:23:45 +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	ethtool: fix drvinfo strings set in drivers	2013-01-06 21:06:31 -08:00
ethtool.h
genregdb.awk	cfg80211: fix parsing when db.txt ends on a rule	2013-11-25 20:50:58 +01:00
ibss.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless	2013-12-06 09:50:45 -05:00
Kconfig	lib80211: hide Kconfig symbol	2012-11-16 14:29:09 -05: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 exports for functions not called by other modules	2011-08-09 15:42:36 -04:00
Makefile	cfg80211: add tracing to rdev-ops	2012-10-18 10:53:37 +02:00
mesh.c	nl80211: allow the use of DFS channel in mesh	2013-12-04 09:12:10 +01:00
mlme.c	cfg80211: aggregate mgmt_tx parameters into a struct	2013-12-02 11:51:52 +01:00
nl80211.c	nl80211: add VHT support for set_bitrate_mask	2013-12-16 16:05:17 +01:00
nl80211.h	cfg80211/mac80211: DFS setup chandef for cac event	2013-11-25 20:50:46 +01:00
radiotap.c	radiotap: fix bitmap-end-finding buffer overrun	2013-12-16 12:06:43 +01:00
rdev-ops.h	cfg80211: aggregate mgmt_tx parameters into a struct	2013-12-02 11:51:52 +01:00
reg.c	cfg80211: add reg_get_dfs_region()	2013-12-03 13:53:40 +01:00
reg.h	cfg80211: add reg_get_dfs_region()	2013-12-03 13:53:40 +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	cfg80211: don't "leak" uncompleted scans	2013-12-05 19:06:47 +01:00
sme.c	cfg80211: fix WARN_ON for re-association to the expired BSS	2013-12-05 15:00:29 +01: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	cfg80211: aggregate mgmt_tx parameters into a struct	2013-12-02 11:51:52 +01:00
util.c	nl80211/cfg80211: enable DFS for IBSS mode	2013-10-28 15:05:21 +01:00
wext-compat.c	cfg80211: vastly simplify locking	2013-05-25 00:02:15 +02:00
wext-compat.h	cfg80211: remove unused wext handler exports	2011-08-08 14:26:29 -04: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	cfg80211: separate internal SME implementation	2013-06-04 13:03:11 +02:00
wext-spy.c	wireless: Convert compare_ether_addr to ether_addr_equal	2012-05-09 20:49:19 -04:00