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

Conflicts were two cases of simple overlapping changes,
nothing serious.

In the UDP case, we need to add a hlist_add_tail_rcu()
to linux/rculist.h, because we've moved UDP socket handling
away from using nulls lists.

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

2016-04-23 18:51:33 -04: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: remove enum ieee80211_band

2016-04-12 15:56:15 +02:00

core.c

cfg80211: remove enum ieee80211_band

2016-04-12 15:56:15 +02:00

core.h

cfg80211: Remove unused cfg80211_can_use_iftype_chan()

2015-12-04 14:43:32 +01:00

db.txt

wireless: support internal statically compiled regulatory database

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

debugfs.c

cfg80211: remove enum ieee80211_band

2016-04-12 15:56:15 +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

cfg80211: remove enum ieee80211_band

2016-04-12 15:56:15 +02:00

Kconfig

cfg80211: Fix some linguistics in Kconfig

2016-02-24 09:04:23 +01:00

lib80211_crypt_ccmp.c

lib80211: ratelimit key index mismatch

2015-12-04 14:43:32 +01:00

lib80211_crypt_tkip.c

lib80211: Use skcipher and ahash

2016-01-27 20:36:03 +08:00

lib80211_crypt_wep.c

lib80211: Use skcipher and ahash

2016-01-27 20:36:03 +08: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: remove enum ieee80211_band

2016-04-12 15:56:15 +02:00

mlme.c

cfg80211: remove enum ieee80211_band

2016-04-12 15:56:15 +02:00

nl80211.c

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

2016-04-23 18:51:33 -04:00

nl80211.h

cfg80211: allow wiphy specific regdomain management

2014-12-17 11:49:55 +01:00

ocb.c

cfg80211: ocb: Fix null pointer deref if join_ocb is unimplemented

2015-12-04 14:43:32 +01:00

radiotap.c

cfg80211: add radiotap VHT info to rtap_namespace_sizes

2016-02-24 09:04:41 +01:00

rdev-ops.h

cfg80211: remove enum ieee80211_band

2016-04-12 15:56:15 +02:00

reg.c

cfg80211: remove enum ieee80211_band

2016-04-12 15:56:15 +02:00

reg.h

cfg80211: remove enum ieee80211_band

2016-04-12 15:56:15 +02: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: remove enum ieee80211_band

2016-04-12 15:56:15 +02:00

sme.c

cfg80211: remove enum ieee80211_band

2016-04-12 15:56:15 +02:00

sysfs.c

cfg80211: Switch to PM ops

2015-05-20 15:00:12 +02: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: remove enum ieee80211_band

2016-04-12 15:56:15 +02:00

util.c

cfg80211: remove enum ieee80211_band

2016-04-12 15:56:15 +02:00

wext-compat.c

cfg80211: remove enum ieee80211_band

2016-04-12 15:56:15 +02:00

wext-compat.h

cfg80211-wext: export symbols only when needed

2015-02-28 21:31:09 +01:00

wext-core.c

wext: unregister_pernet_subsys() on notifier registration failure

2016-04-05 10:48: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