openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
linux/net/wireless
History
David S. Miller b20b378d49 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/ethernet/mediatek/mtk_eth_soc.c
	drivers/net/ethernet/qlogic/qed/qed_dcbx.c
	drivers/net/phy/Kconfig

All conflicts were cases of overlapping commits.

Signed-off-by: David S. Miller <davem@davemloft.net>
 		2016-09-12 15:52:44 -07:00
..
.gitignore
…
Kconfig cfg80211: Fix some linguistics in Kconfig 2016-02-24 09:04:23 +01:00
Makefile cfg80211: 802.11p OCB mode handling 2014-11-04 13:18:17 +01:00
ap.c cfg80211: export interface stopping function 2014-05-06 15:16:34 +02:00
chan.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-08-17 17:26:58 -07:00
core.c cfg80211: always notify userspace when wireless netdev is removed 2016-08-11 16:51:42 +02:00
core.h nl80211: support beacon report scanning 2016-07-06 14:51:31 +02:00
db.txt
…
debugfs.c cfg80211: remove enum ieee80211_band 2016-04-12 15:56:15 +02:00
debugfs.h
…
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
lib80211.c lib80211: remove unused print_ssid() 2014-10-14 02:18:27 +02: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
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 nl80211: explicitly check enum nl80211_mesh_power_mode 2016-08-11 20:00:37 +02:00
nl80211.h cfg80211: always notify userspace of new wireless netdevs 2016-08-11 16:51:41 +02: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: make wdev_list accessible to drivers 2016-05-12 11:16:40 +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 nl80211: support beacon report scanning 2016-07-06 14:51:31 +02:00
sme.c cfg80211: Allow cfg80211_connect_result() errors to be distinguished 2016-05-31 15:22:15 +02:00
sysfs.c cfg80211: make wdev_list accessible to drivers 2016-05-12 11:16:40 +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 nl80211: support beacon report scanning 2016-07-06 14:51:31 +02:00
util.c cfg80211: identically validate beacon interval for AP/MESH/IBSS 2016-08-11 20:00:36 +02:00
wext-compat.c wext: remove a/b/g/n from SIOCGIWNAME 2016-05-02 22:48:09 +02:00
wext-compat.h cfg80211-wext: export symbols only when needed 2015-02-28 21:31:09 +01:00
wext-core.c Revert "wext: Fix 32 bit iwpriv compatibility issue with 64 bit Kernel" 2016-08-08 08:49:50 +02:00
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 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