FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-01-12 20:31:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
linux/net/mac80211
History
David S. Miller 9f0d34bc34 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/usb/asix_common.c
	drivers/net/usb/sr9800.c
	drivers/net/usb/usbnet.c
	include/linux/usb/usbnet.h
	net/ipv4/tcp_ipv4.c
	net/ipv6/tcp_ipv6.c

The TCP conflicts were overlapping changes.  In 'net' we added a
READ_ONCE() to the socket cached RX route read, whilst in 'net-next'
Eric Dumazet touched the surrounding code dealing with how mini
sockets are handled.

With USB, it's a case of the same bug fix first going into net-next
and then I cherry picked it back into net.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-04-02 16:16:53 -04:00
..
aes_ccm.c
mac80111: aes_ccm: cleanup ieee80211_aes_key_setup_encrypt()
2015-03-30 10:40:03 +02:00
aes_ccm.h
mac80111: Add CCMP-256 cipher
2015-01-27 11:07:35 +01:00
aes_cmac.c
mac80111: Add BIP-CMAC-256 cipher
2015-01-27 11:09:13 +01:00
aes_cmac.h
mac80111: Add BIP-CMAC-256 cipher
2015-01-27 11:09:13 +01:00
aes_gcm.c
mac80111: aes_gcm: clean up ieee80211_aes_gcm_key_setup_encrypt()
2015-03-30 10:42:02 +02:00
aes_gcm.h
mac80111: Add GCMP and GCMP-256 ciphers
2015-01-27 11:06:09 +01:00
aes_gmac.c
mac80211: Fix misplaced return in AES-GMAC key setup
2015-03-30 10:38:07 +02:00
aes_gmac.h
mac80111: Add BIP-GMAC-128 and BIP-GMAC-256 ciphers
2015-01-27 11:10:13 +01:00
agg-rx.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-04-02 16:16:53 -04:00
agg-tx.c
mac80211: reject aggregation sessions with non-HT peers
2015-03-30 10:33:19 +02:00
cfg.c
Lots of updates for net-next; along with the usual flurry
2015-03-31 16:39:04 -04:00
cfg.h
mac80211: make cfg80211 ops and privid const
2014-02-04 21:48:21 +01:00
chan.c
mac80211: clear sdata->radar_required
2015-02-24 10:51:06 +01:00
debug.h
mac80211: 802.11p OCB mode support
2014-11-04 13:18:21 +01:00
debugfs_key.c
mac80111: Add BIP-GMAC-128 and BIP-GMAC-256 ciphers
2015-01-27 11:10:13 +01:00
debugfs_key.h
…
debugfs_netdev.c
mac80211: remove drop_unencrypted code
2015-03-20 11:37:36 +01:00
debugfs_netdev.h
mac80211: fix some missing includes
2014-04-09 14:49:43 +02:00
debugfs_sta.c
mac80211: remove TX latency measurement code
2015-02-28 21:31:11 +01:00
debugfs_sta.h
…
debugfs.c
mac80211: remove drop_unencrypted code
2015-03-20 11:37:36 +01:00
debugfs.h
mac80211: fix some missing includes
2014-04-09 14:49:43 +02:00
driver-ops.h
mac80211: convert rssi_callback() to event_callback()
2015-03-30 10:17:09 +02:00
ethtool.c
cfg80211: remove enum station_info_flags
2015-01-08 15:28:10 +01:00
event.c
…
ht.c
mac80211: add VHT support for IBSS
2015-03-30 10:48:26 +02:00
ibss.c
Lots of updates for net-next; along with the usual flurry
2015-03-31 16:39:04 -04:00
ieee80211_i.h
Lots of updates for net-next; along with the usual flurry
2015-03-31 16:39:04 -04:00
iface.c
cfg80211: pass name_assign_type to rdev_add_virtual_intf()
2015-03-30 10:36:17 +02:00
Kconfig
mac80111: Add GCMP and GCMP-256 ciphers
2015-01-27 11:06:09 +01:00
key.c
mac80211: Get IV len from key conf and not cipher scheme
2015-03-17 12:34:26 +01:00
key.h
mac80211: Get IV len from key conf and not cipher scheme
2015-03-17 12:34:26 +01:00
led.c
mac80211: use oneshot blink API for LED triggers
2013-08-01 10:48:49 +02:00
led.h
mac80211: use oneshot blink API for LED triggers
2013-08-01 10:48:49 +02:00
main.c
cfg80211: pass name_assign_type to rdev_add_virtual_intf()
2015-03-30 10:36:17 +02:00
Makefile
mac80111: Add BIP-GMAC-128 and BIP-GMAC-256 ciphers
2015-01-27 11:10:13 +01:00
mesh_hwmp.c
mac80211: remove unnecessary break after return
2014-07-15 16:27:00 -07:00
mesh_pathtbl.c
mac80211: implement cfg80211_ops to query mesh proxy path table
2014-10-09 11:19:07 +02:00
mesh_plink.c
mac80211: add VHT support for IBSS
2015-03-30 10:48:26 +02:00
mesh_ps.c
mac80211: clear sequence/fragment number in QoS-null frames
2014-03-05 15:49:54 +01:00
mesh_sync.c
mac80211: remove BUG_ON usage
2014-04-29 17:59:27 +02:00
mesh.c
Lots of updates for net-next; along with the usual flurry
2015-03-31 16:39:04 -04:00
mesh.h
mac80211: implement cfg80211_ops to query mesh proxy path table
2014-10-09 11:19:07 +02:00
michael.c
…
michael.h
mac80211: fix some missing includes
2014-04-09 14:49:43 +02:00
mlme.c
Lots of updates for net-next; along with the usual flurry
2015-03-31 16:39:04 -04:00
ocb.c
mac80211: 802.11p OCB mode support
2014-11-04 13:18:21 +01:00
offchannel.c
mac80211: let flush() drop packets when possible
2015-01-14 09:31:18 +01:00
pm.c
mac80211: start queues if driver rejected wowlan
2015-03-04 10:34:09 +01:00
rate.c
mac80211: add more missing checks for VHT tx rates
2014-11-28 14:24:23 +01:00
rate.h
mac80211: add ieee80211_tx_status_noskb
2014-11-28 15:01:51 +01:00
rc80211_minstrel_debugfs.c
mac80211: minstrels: fix buffer overflow in HT debugfs rc_stats
2014-10-20 16:37:01 +02:00
rc80211_minstrel_ht_debugfs.c
mac80211: minstrel_ht: use group flags instead of index to display rates
2014-10-23 20:36:13 +02:00
rc80211_minstrel_ht.c
mac80211: minstrel_ht: fix rounding issue in MCS duration calculation
2015-03-17 11:03:30 +01:00
rc80211_minstrel_ht.h
mac80211: minstrel_ht: add basic support for VHT rates <= 3SS@80MHz
2014-10-21 13:25:26 +02:00
rc80211_minstrel.c
mac80211/minstrel: fix !x!=0 confusion
2015-02-24 21:12:07 +01:00
rc80211_minstrel.h
mac80211: minstrel: reduce size of struct minstrel_rate_stats
2014-12-19 21:34:22 +01:00
rx.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-04-02 16:16:53 -04:00
scan.c
mac80211: IBSS fix scan request
2015-03-30 10:47:56 +02:00
spectmgmt.c
mac80211: remove unused variable in ieee80211_parse_ch_switch_ie()
2014-12-17 15:45:17 +01:00
sta_info.c
mac80211: avoid duplicate TX path station lookup
2015-03-20 16:27:36 +01:00
sta_info.h
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-04-02 16:16:53 -04:00
status.c
mac80211: remove TX latency measurement code
2015-02-28 21:31:11 +01:00
tdls.c
mac80211: send HT/VHT IEs in TDLS discovery response
2015-03-30 10:48:59 +02:00
tkip.c
mac80211: fix checkpatch errors
2013-12-18 10:33:06 +01:00
tkip.h
…
trace.c
mac80211: trace debug messages
2012-06-24 11:33:18 +02:00
trace.h
mac80211: convert rssi_callback() to event_callback()
2015-03-30 10:17:09 +02:00
tx.c
Lots of updates for net-next; along with the usual flurry
2015-03-31 16:39:04 -04:00
util.c
Lots of updates for net-next; along with the usual flurry
2015-03-31 16:39:04 -04:00
vht.c
mac80211: TDLS: support VHT between peers
2015-03-03 15:56:07 +01:00
wep.c
mac80211: fix network header breakage during encryption
2014-10-23 20:40:01 +02:00
wep.h
mac80211: move RX WEP weak IV counting
2012-03-13 14:54:16 -04:00
wme.c
mac80211: synchronously reserve TID per station
2014-11-19 18:45:36 +01:00
wme.h
mac80211: add WMM admission control support
2014-10-22 10:42:09 +02:00
wpa.c
mac80211: Get IV len from key conf and not cipher scheme
2015-03-17 12:34:26 +01:00
wpa.h
mac80111: Add BIP-GMAC-128 and BIP-GMAC-256 ciphers
2015-01-27 11:10:13 +01:00