FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-02-06 19:39:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
linux/net/mac80211
History
David S. Miller 26440c835f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/usb/asix_common.c
	net/ipv4/inet_connection_sock.c
	net/switchdev/switchdev.c

In the inet_connection_sock.c case the request socket hashing scheme
is completely different in net-next.

The other two conflicts were overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-10-20 06:08:27 -07:00
..
aes_ccm.c
mac80211: Switch to new AEAD interface
2015-05-28 11:23:20 +08:00
aes_ccm.h
…
aes_cmac.c
mac80211: remove ieee80211_aes_cmac_calculate_k1_k2()
2015-08-13 11:31:45 +02:00
aes_cmac.h
…
aes_gcm.c
mac80211: Switch to new AEAD interface
2015-05-28 11:23:20 +08:00
aes_gcm.h
…
aes_gmac.c
mac80211: Switch to new AEAD interface
2015-05-28 11:23:20 +08:00
aes_gmac.h
…
agg-rx.c
mac80211: allow the driver to advertise A-MSDU within A-MPDU Rx support
2015-09-22 15:21:24 +02:00
agg-tx.c
mac80211: allow to transmit A-MSDU within A-MPDU
2015-09-22 15:21:23 +02:00
cfg.c
For the current cycle, we have the following right now:
2015-10-07 04:29:18 -07:00
cfg.h
…
chan.c
mac80211: upgrade BW of TDLS peers when possible
2015-07-17 15:38:12 +02:00
debug.h
…
debugfs_key.c
mac80211: allow writing TX PN in debugfs
2015-09-29 15:56:50 +02:00
debugfs_key.h
…
debugfs_netdev.c
mac80211: remove last_beacon/ave_beacon debugfs files
2015-09-22 15:21:25 +02:00
debugfs_netdev.h
…
debugfs_sta.c
mac80211: clean up station debugfs
2015-05-05 14:21:55 +02:00
debugfs_sta.h
…
debugfs.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-10-20 06:08:27 -07:00
debugfs.h
…
driver-ops.c
mac80211: Deinline drv_get/set/reset_tsf()
2015-09-29 15:56:49 +02:00
driver-ops.h
mac80211: Deinline drv_get/set/reset_tsf()
2015-09-29 15:56:49 +02:00
ethtool.c
…
event.c
…
ht.c
…
ibss.c
mac80211: fix the beacon csa counter for mesh and ibss
2015-06-09 22:04:25 +02:00
ieee80211_i.h
mac80211: use bool argument to ieee80211_send_nullfunc
2015-09-29 15:56:52 +02:00
iface.c
mac80211: process skb_queue while scanning in HW
2015-09-22 15:21:20 +02:00
Kconfig
mac80211: use DECLARE_EWMA
2015-08-14 17:49:53 +02:00
key.c
mac80211: remove sta_info.gtk_idx
2015-07-17 15:37:54 +02:00
key.h
mac80211: remove key TX/RX counter
2015-07-17 15:38:01 +02:00
led.c
mac80211: fix throughput LED trigger
2015-05-11 19:16:04 +02:00
led.h
mac80211: make LED triggering depend on activation
2015-05-05 14:21:56 +02:00
main.c
mac80211: advertise support for full station state in AP mode
2015-09-29 15:56:51 +02:00
Makefile
mac80211: deinline drv_sta_state
2015-07-17 15:48:50 +02:00
mesh_hwmp.c
mac80211: mesh: move fail_avg into mesh struct
2015-07-17 15:38:24 +02:00
mesh_pathtbl.c
…
mesh_plink.c
mac80211: implement VHT support for mesh
2015-09-22 15:21:25 +02:00
mesh_ps.c
mac80211: mesh: separate plid and aid concepts
2015-07-17 15:47:11 +02:00
mesh_sync.c
mac80211: move mesh related station fields to own struct
2015-07-17 15:38:06 +02:00
mesh.c
mac80211: make ieee80211_new_mesh_header return unsigned
2015-10-05 17:54:16 +02:00
mesh.h
mac80211: make ieee80211_new_mesh_header return unsigned
2015-10-05 17:54:16 +02:00
michael.c
…
michael.h
…
mlme.c
For the current cycle, we have the following right now:
2015-10-07 04:29:18 -07:00
ocb.c
mac80211: Make OCB mode set BSSID
2015-08-14 17:49:49 +02:00
offchannel.c
mac80211: use bool argument to ieee80211_send_nullfunc
2015-09-29 15:56:52 +02:00
pm.c
mac80211: don't tear down aggregation on suspend in case of wowlan->any
2015-09-29 15:56:47 +02:00
rate.c
For the current cycle, we have the following right now:
2015-10-07 04:29:18 -07:00
rate.h
mac80211: deinline rate_control_rate_init, rate_control_rate_update
2015-07-17 15:50:02 +02:00
rc80211_minstrel_debugfs.c
mac80211: minstrel[_ht]: remove non-ascii debugfs characters
2015-09-29 15:56:47 +02:00
rc80211_minstrel_ht_debugfs.c
mac80211: minstrel[_ht]: remove non-ascii debugfs characters
2015-09-29 15:56:47 +02:00
rc80211_minstrel_ht.c
mac80211: minstrel_ht: handle peers in dynamic SMPS
2015-07-17 15:38:20 +02:00
rc80211_minstrel_ht.h
…
rc80211_minstrel.c
mac80211: fix invalid read in minstrel_sort_best_tp_rates()
2015-08-13 13:52:34 +02:00
rc80211_minstrel.h
…
rx.c
mac80211: use DECLARE_EWMA
2015-08-14 17:49:53 +02:00
scan.c
mac80211: convert HW flags to unsigned long bitmap
2015-06-10 16:05:36 +02:00
spectmgmt.c
…
sta_info.c
mac80211: use ktime_get_seconds
2015-10-05 03:16:45 -07:00
sta_info.h
mac80211: allow to transmit A-MSDU within A-MPDU
2015-09-22 15:21:23 +02:00
status.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-10-20 06:08:27 -07:00
tdls.c
For the current cycle, we have the following right now:
2015-10-07 04:29:18 -07:00
tkip.c
…
tkip.h
…
trace_msg.h
…
trace.c
…
trace.h
mac80211: allow to transmit A-MSDU within A-MPDU
2015-09-22 15:21:23 +02:00
tx.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-10-20 06:08:27 -07:00
util.c
mac80211: use bool argument to ieee80211_send_nullfunc
2015-09-29 15:56:52 +02:00
vht.c
mac80211: avoid VHT usage with no 80MHz chans allowed
2015-09-04 14:31:41 +02:00
wep.c
mac80211: move WEP tailroom size check
2015-05-11 14:51:29 +02:00
wep.h
…
wme.c
…
wme.h
…
wpa.c
mac80211: support device/driver PN check for CCMP/GCMP
2015-07-17 15:38:02 +02:00
wpa.h
…