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

Lots of easy overlapping changes in the confict
resolutions here.

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

2018-05-26 19:46:15 -04:00

..

certs

cfg80211: ship certificates as hex files

2017-12-19 09:28:01 +01:00

.gitignore

…

ap.c

nl80211: Add SOCKET_OWNER support to START_AP

2018-03-29 10:47:28 +02:00

chan.c

cfg80211: enable use of non-cleared DFS channels for DFS offload

2018-03-29 10:21:35 +02:00

core.c

nl80211: Update ERP info using NL80211_CMD_UPDATE_CONNECT_PARAMS

2018-05-23 11:21:35 +02:00

core.h

nl80211: Add SOCKET_OWNER support to JOIN_MESH

2018-03-29 10:38:24 +02:00

debugfs.c

…

debugfs.h

…

ethtool.c

…

ibss.c

nl80211: Add SOCKET_OWNER support to JOIN_IBSS

2018-03-29 10:36:22 +02:00

Kconfig

cfg80211: add missing dependency to CFG80211 suboptions

2018-02-27 10:54:12 +01:00

lib80211_crypt_ccmp.c

…

lib80211_crypt_tkip.c

…

lib80211_crypt_wep.c

…

lib80211.c

treewide: setup_timer() -> timer_setup()

2017-11-21 15:57:07 -08:00

Makefile

cfg80211: ship certificates as hex files

2017-12-19 09:28:01 +01:00

mesh.c

nl80211: Add SOCKET_OWNER support to JOIN_MESH

2018-03-29 10:38:24 +02:00

mlme.c

cfg80211: fix CAC_STARTED event handling

2018-03-29 10:21:16 +02:00

nl80211.c

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

2018-05-26 19:46:15 -04:00

nl80211.h

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

2017-11-04 09:26:51 +09:00

ocb.c

…

of.c

…

radiotap.c

…

rdev-ops.h

cfg80211: Expose TXQ stats and parameters to userspace

2018-05-08 13:19:24 +02:00

reg.c

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

2018-05-26 19:46:15 -04:00

reg.h

…

scan.c

cfg80211: Scan results to also report the per chain signal strength

2017-12-19 10:37:31 +01:00

sme.c

nl80211: add FILS related parameters to ROAM event

2018-05-23 11:19:02 +02:00

sysfs.c

…

sysfs.h

…

trace.c

…

trace.h

cfg80211: Expose TXQ stats and parameters to userspace

2018-05-08 13:19:24 +02:00

util.c

cfg80211: dynamically allocate per-tid stats for station info

2018-05-18 11:14:34 +02:00

wext-compat.c

cfg80211/mac80211: revert to stack allocation for sinfo

2018-05-18 11:14:35 +02:00

wext-compat.h

…

wext-core.c

net: Don't take rtnl_lock() in wireless_nlevent_flush()

2018-03-29 13:47:53 -04:00

wext-priv.c

…

wext-proc.c

net: Use octal not symbolic permissions

2018-03-26 12:07:48 -04:00

wext-sme.c

…

wext-spy.c

…