David S. Miller b05930f5d1 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	drivers/net/wireless/iwlwifi/pcie/trans.c
	include/linux/inetdevice.h

The inetdevice.h conflict involves moving the IPV4_DEVCONF values
into a UAPI header, overlapping additions of some new entries.

The iwlwifi conflict is a context overlap.

Signed-off-by: David S. Miller <davem@davemloft.net>

2013-08-26 16:37:08 -04: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

nl80211/cfg80211: add 5 and 10 MHz defines and wiphy flag

2013-06-18 16:06:50 +02:00

core.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless

2013-08-09 15:06:28 -04:00

core.h

cfg80211/nl80211: Add packet coalesce support

2013-07-16 09:58:00 +03:00

db.txt

wireless: support internal statically compiled regulatory database

2009-12-21 18:56:10 -05:00

debugfs.c

cfg80211: vastly simplify locking

2013-05-25 00:02:15 +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

net/wireless/ethtool.h: drop unnecessary include of linux/ethtool.h

2009-10-07 16:39:49 -04:00

genregdb.awk

cfg80211: relicense reg.c reg.h and genregdb.awk to ISC

2012-01-04 14:30:41 -05:00

ibss.c

cfg80211: separate internal SME implementation

2013-06-04 13:03:11 +02: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

cfg80211/mac80211: get mandatory rates based on scan width

2013-07-16 09:58:07 +03:00

mlme.c

cfg80211: hold BSS over association process

2013-06-19 18:55:39 +02:00

nl80211.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2013-08-26 16:37:08 -04:00

nl80211.h

cfg80211/nl80211: Add packet coalesce support

2013-07-16 09:58:00 +03:00

radiotap.c

wireless: add radiotap A-MPDU status field

2012-08-20 13:53:09 +02:00

rdev-ops.h

nl80211/cfg80211: add channel switch command

2013-08-01 18:30:28 +02:00

reg.c

regulatory: use correct regulatory initiator on wiphy register

2013-07-25 09:52:46 +02:00

reg.h

regulatory: use RCU to protect global and wiphy regdomains

2013-01-03 13:01:29 +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: add scan width to bss and scan request structs

2013-07-16 09:58:01 +03:00

sme.c

cfg80211: don't request disconnect if not connected

2013-08-14 14:00:19 +02:00

sysfs.c

cfg80211: fix compilation warning for cfg80211_leave_all()

2013-06-24 15:57:32 +02:00

sysfs.h

[WIRELESS] cfg80211: New wireless config infrastructure.

2007-04-25 22:29:41 -07:00

trace.c

cfg80211: add tracing to rdev-ops

2012-10-18 10:53:37 +02:00

trace.h

nl80211/cfg80211: add channel switch command

2013-08-01 18:30:28 +02:00

util.c

cfg80211/mac80211: get mandatory rates based on scan width

2013-07-16 09:58:07 +03: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