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

Conflicts:
	drivers/net/geneve.c

Here we had an overlapping change, where in 'net' the extraneous stats
bump was being removed whilst in 'net-next' the final argument to
udp_tunnel6_xmit_skb() was being changed.

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

2015-12-17 22:08:28 -05:00

..

.gitignore

…

ap.c

…

chan.c

cfg80211: use RTNL locked reg_can_beacon for IR-relaxation

2015-07-17 15:02:02 +02:00

core.c

cfg80211: fix gHz to GHz

2015-10-15 16:17:07 +02:00

core.h

cfg80211: Remove unused cfg80211_can_use_iftype_chan()

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

db.txt

…

debugfs.c

…

debugfs.h

…

ethtool.c

…

genregdb.awk

…

ibss.c

Merge tag 'mac80211-next-for-davem-2015-03-30' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

2015-03-31 16:39:04 -04:00

Kconfig

cfg80211: reg: make CRDA support optional

2015-10-16 09:15:39 +02:00

lib80211_crypt_ccmp.c

lib80211: ratelimit key index mismatch

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

lib80211_crypt_tkip.c

lib80211: ratelimit key index mismatch

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

lib80211_crypt_wep.c

…

lib80211.c

…

Makefile

…

mesh.c

…

mlme.c

cfg80211: allow mgmt_frame_register callback to sleep

2015-07-17 15:38:26 +02:00

nl80211.c

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

2015-12-17 22:08:28 -05: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

…

rdev-ops.h

cfg80211: Add support for aborting an ongoing scan

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

reg.c

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

2015-12-17 22:08:28 -05:00

reg.h

cfg80211: Stop calling crda if it is not responsive

2015-04-01 11:22:38 +02:00

regdb.h

…

scan.c

cfg80211: Add multiple scan plans for scheduled scan

2015-10-13 10:35:26 +02:00

sme.c

cfg80211: properly send NL80211_ATTR_DISCONNECTED_BY_AP in disconnect

2015-05-26 15:21:27 +02:00

sysfs.c

cfg80211: Switch to PM ops

2015-05-20 15:00:12 +02:00

sysfs.h

…

trace.c

…

trace.h

cfg80211: Add support for aborting an ongoing scan

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

util.c

cfg80211: Remove unused cfg80211_can_use_iftype_chan()

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

wext-compat.c

cfg80211: wext: clear sinfo struct before calling driver

2015-06-09 13:54:58 -07:00

wext-compat.h

cfg80211-wext: export symbols only when needed

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

wext-core.c

…

wext-priv.c

…

wext-proc.c

…

wext-sme.c

wireless: Use eth_<foo>_addr instead of memset

2015-03-03 17:01:38 -05:00

wext-spy.c

…