moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
83ad357dee467f63574de35752bc40033deab30e
kernel_arpi/net/mac80211
History
David S. Miller 0ddead90b2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
The conflicts were two cases of overlapping changes in
batman-adv and the qed driver.

Signed-off-by: David S. Miller <davem@davemloft.net>
2017-06-15 11:59:32 -04:00
..
aes_ccm.c
…
aes_ccm.h
…
aes_cmac.c
mac80211: aes-cmac: switch to shash CMAC driver
2017-02-08 09:19:33 +01:00
aes_cmac.h
mac80211: aes-cmac: switch to shash CMAC driver
2017-02-08 09:19:33 +01:00
aes_gcm.c
…
aes_gcm.h
…
aes_gmac.c
…
aes_gmac.h
…
agg-rx.c
mac80211: manage RX BA session offload without SKB queue
2017-06-08 14:16:29 +02:00
agg-tx.c
mac80211: fix TX aggregation start/stop callback race
2017-05-30 09:08:40 +02:00
cfg.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2017-06-15 11:59:32 -04:00
chan.c
…
debug.h
…
debugfs_key.c
…
debugfs_key.h
…
debugfs_netdev.c
…
debugfs_netdev.h
…
debugfs_sta.c
mac80211: Dynamically set CoDel parameters per station
2017-05-17 16:03:40 +02:00
debugfs_sta.h
…
debugfs.c
mac80211: check for allocation failure in debugfs code
2017-02-08 10:05:07 +01:00
debugfs.h
…
driver-ops.c
…
driver-ops.h
…
ethtool.c
…
fils_aead.c
Merge tag 'mac80211-next-for-davem-2017-02-09' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
2017-02-10 14:31:51 -05:00
fils_aead.h
…
ht.c
mac80211: manage RX BA session offload without SKB queue
2017-06-08 14:16:29 +02:00
ibss.c
mac80211: move clearing result into ieee80211_parse_ch_switch_ie()
2017-05-19 13:25:57 +02:00
ieee80211_i.h
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2017-06-15 11:59:32 -04:00
iface.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2017-06-15 11:59:32 -04:00
Kconfig
mac80211: fils_aead: Use crypto api CMAC shash rather than bare cipher
2017-02-08 09:19:17 +01:00
key.c
…
key.h
mac80211: aes-cmac: switch to shash CMAC driver
2017-02-08 09:19:33 +01:00
led.c
…
led.h
…
main.c
mac80211: disentangle iflist_mtx and chanctx_mtx
2017-04-26 23:17:44 +02:00
Makefile
…
mesh_hwmp.c
mac80211: fix mesh fail_avg check
2017-03-06 09:21:46 +01:00
mesh_pathtbl.c
mac80211: Use setup_timer instead of init_timer for mesh path
2017-03-16 10:54:04 +01:00
mesh_plink.c
skbuff/mac80211: introduce and use skb_put_zero()
2017-05-30 09:14:30 +02:00
mesh_ps.c
…
mesh_sync.c
…
mesh.c
skbuff/mac80211: introduce and use skb_put_zero()
2017-05-30 09:14:30 +02:00
mesh.h
…
michael.c
…
michael.h
…
mlme.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2017-06-15 11:59:32 -04:00
ocb.c
…
offchannel.c
…
pm.c
cfg80211: add request id to cfg80211_sched_scan_*() api
2017-04-28 14:51:43 +02:00
rate.c
mac80211: Dynamically set CoDel parameters per station
2017-05-17 16:03:40 +02:00
rate.h
mac80211: make rate control tx status API more extensible
2017-04-28 10:57:33 +02:00
rc80211_minstrel_debugfs.c
…
rc80211_minstrel_ht_debugfs.c
…
rc80211_minstrel_ht.c
mac80211: make rate control tx status API more extensible
2017-04-28 10:57:33 +02:00
rc80211_minstrel_ht.h
…
rc80211_minstrel.c
mac80211: make rate control tx status API more extensible
2017-04-28 10:57:33 +02:00
rc80211_minstrel.h
…
rx.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2017-06-15 11:59:32 -04:00
scan.c
cfg80211: add request id to cfg80211_sched_scan_*() api
2017-04-28 14:51:43 +02:00
spectmgmt.c
mac80211: move clearing result into ieee80211_parse_ch_switch_ie()
2017-05-19 13:25:57 +02:00
sta_info.c
Merge remote-tracking branch 'net-next/master' into mac80211-next
2017-06-08 14:14:45 +02:00
sta_info.h
mac80211: manage RX BA session offload without SKB queue
2017-06-08 14:16:29 +02:00
status.c
mac80211: Invoke TX LED in more code paths
2017-05-30 09:18:13 +02:00
tdls.c
mac80211: Fix possible sband related NULL pointer de-reference
2017-04-28 12:28:44 +02:00
tkip.c
…
tkip.h
…
trace_msg.h
…
trace.c
…
trace.h
mac80211: add the action to the drv_ampdu_action tracepoint
2017-06-13 11:06:39 +02:00
tx.c
mac80211: Dynamically set CoDel parameters per station
2017-05-17 16:03:40 +02:00
util.c
mac80211: mesh: support sending wide bandwidth CSA
2017-05-24 08:58:54 +02:00
vht.c
…
wep.c
…
wep.h
…
wme.c
…
wme.h
…
wpa.c
mac80211/wpa: use constant time memory comparison for MACs
2017-06-13 10:24:34 +02:00
wpa.h
…