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

All of the conflicts were cases of overlapping changes.

In net/core/devlink.c, we have to make care that the
resouce size_params have become a struct member rather
than a pointer to such an object.

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

2018-03-06 01:20:46 -05:00

..

certs

cfg80211: ship certificates as hex files

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

.gitignore

…

ap.c

…

chan.c

…

core.c

net: Convert cfg80211_pernet_ops

2018-02-19 14:19:09 -05:00

core.h

mac80211_hwsim: validate number of different channels

2018-01-15 09:34:45 +01:00

debugfs.c

…

debugfs.h

…

ethtool.c

…

ibss.c

cfg80211: IBSS: Add support for static WEP in driver for IBSS

2017-12-11 12:19:21 +01: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

…

Makefile

cfg80211: ship certificates as hex files

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

mesh.c

cfg80211: use only 1Mbps for basic rates in mesh

2018-01-31 12:38:56 +01:00

mlme.c

cfg80211: cleanup signal strength units notation

2017-12-11 12:19:31 +01:00

nl80211.c

Merge tag 'mac80211-next-for-davem-2018-02-22' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

2018-02-22 15:18:28 -05:00

nl80211.h

…

ocb.c

…

of.c

…

radiotap.c

…

rdev-ops.h

cfg80211/nl80211: Optional authentication offload to userspace

2018-01-31 12:56:52 +01:00

reg.c

cfg80211: fully initialize old channel for event

2018-01-15 09:15:03 +01: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

cfg80211: clear wep keys after disconnection

2018-02-19 14:53:12 +01:00

sysfs.c

…

sysfs.h

…

trace.c

…

trace.h

cfg80211/nl80211: Optional authentication offload to userspace

2018-01-31 12:56:52 +01:00

util.c

mac80211: support A-MSDU in fast-rx

2018-02-27 13:30:53 +01:00

wext-compat.c

cfg80211: fix station info handling bugs

2018-01-18 15:36:18 -05:00

wext-compat.h

…

wext-core.c

net: Convert wext_pernet_ops

2018-02-13 10:36:08 -05:00

wext-priv.c

…

wext-proc.c

net: delete /proc THIS_MODULE references

2018-01-16 15:01:33 -05:00

wext-sme.c

…

wext-spy.c

…