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

Conflicts:
	drivers/net/usb/qmi_wwan.c
	include/net/dst.h

Trivial merge conflicts, both were overlapping changes.

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

2013-10-23 16:49:34 -04:00

..

.gitignore

…

ap.c

cfg80211: move exported event functions into nl80211

2013-03-06 16:35:46 +01:00

chan.c

cfg80211: export cfg80211_chandef_dfs_required

2013-09-26 13:27:13 +02:00

core.c

cfg80211: don't add p2p device while in RFKILL

2013-10-09 18:40:16 +02:00

core.h

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

2013-10-23 16:49:34 -04:00

db.txt

…

debugfs.c

mac80211: fix some snprintf misuses

2013-10-01 12:16:51 +02:00

debugfs.h

…

ethtool.c

…

ethtool.h

…

genregdb.awk

cfg80211: parse dfs region for internal regdb option

2013-10-01 12:18:36 +02:00

ibss.c

cfg80211: fix warning when using WEXT for IBSS

2013-09-26 19:43:14 +02:00

Kconfig

…

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

…

Makefile

…

mesh.c

cfg80211/mac80211: get mandatory rates based on scan width

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

mlme.c

cfg80211: add flags to cfg80211_rx_mgmt()

2013-08-23 16:06:03 +02:00

nl80211.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem

2013-10-17 14:02:07 -04:00

nl80211.h

cfg80211: add flags to cfg80211_rx_mgmt()

2013-08-23 16:06:03 +02:00

radiotap.c

wireless: radiotap: fix parsing buffer overrun

2013-10-14 09:47:00 +02:00

rdev-ops.h

cfg80211: add wdev to testmode cmd

2013-08-12 14:11:37 +02:00

reg.c

regulatory: enable channels 52-64 and 100-144 for world roaming

2013-10-01 14:14:02 +02:00

reg.h

…

regdb.h

…

scan.c

wireless: scan: Remove comment to compare_ether_addr

2013-09-03 22:34:48 -04:00

sme.c

cfg80211: don't request disconnect if not connected

2013-08-14 14:00:19 +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

…

trace.h

cfg80211: add wdev to testmode cmd

2013-08-12 14:11:37 +02:00

util.c

cfg80211: vlan priority handling in WMM

2013-10-02 11:04:33 +02:00

wext-compat.c

cfg80211: vastly simplify locking

2013-05-25 00:02:15 +02:00

wext-compat.h

…

wext-core.c

…

wext-priv.c

…

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

…