android_kernel_xiaomi_sm8350/net/mac80211
David S. Miller a1744d3bee Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:

	drivers/net/wireless/p54/p54common.c
2008-10-31 00:17:34 -07:00
..
aes_ccm.c mac80211: aes_ccm.c remove crypto wrapper and extra args 2008-07-08 14:16:02 -04:00
aes_ccm.h mac80211: pass scratch buffer directly, remove additional pointers 2008-07-08 14:16:02 -04:00
cfg.c mac80211: clean up rate control API 2008-09-24 16:18:03 -04:00
cfg.h
debugfs_key.c mac80211: convert to %pM away from print_mac 2008-10-27 17:06:16 -07:00
debugfs_key.h mac80211: fix key vs. sta locking problems 2008-04-08 16:44:45 -04:00
debugfs_netdev.c mac80211: convert to %pM away from print_mac 2008-10-27 17:06:16 -07:00
debugfs_netdev.h mac80211: revamp virtual interface handling 2008-07-14 14:30:07 -04:00
debugfs_sta.c mac80211: convert to %pM away from print_mac 2008-10-27 17:06:16 -07:00
debugfs_sta.h mac80211: RCU-ify STA info structure access 2008-03-06 15:30:46 -05:00
debugfs.c mac80211: make bridge_packets a virtual interface option 2008-09-15 16:48:22 -04:00
debugfs.h
event.c mac80211: convert to %pM away from print_mac 2008-10-27 17:06:16 -07:00
ht.c mac80211: convert to %pM away from print_mac 2008-10-27 17:06:16 -07:00
ieee80211_i.h mac80211: fix HT information element parsing 2008-10-14 20:47:15 -04:00
iface.c mac80211: fixups for "make master iface not wireless" 2008-09-30 14:07:23 -04:00
Kconfig mac80211: add the 'minstrel' rate control algorithm 2008-10-06 18:14:57 -04:00
key.c mac80211: convert to %pM away from print_mac 2008-10-27 17:06:16 -07:00
key.h mac80211: Let drivers have access to TKIP key offets for TX and RX MIC 2008-06-27 09:09:17 -04:00
led.c mac80211: rename files 2008-04-08 16:44:45 -04:00
led.h mac80211: rename files 2008-04-08 16:44:45 -04:00
main.c mac80211: add the 'minstrel' rate control algorithm 2008-10-06 18:14:57 -04:00
Makefile mac80211: add the 'minstrel' rate control algorithm 2008-10-06 18:14:57 -04:00
mesh_hwmp.c mac80211: move txrate_idx into RC algorithms 2008-09-15 16:48:24 -04:00
mesh_pathtbl.c mac80211: mesh portal functionality support 2008-09-24 16:18:02 -04:00
mesh_plink.c mac80211: convert to %pM away from print_mac 2008-10-27 17:06:16 -07:00
mesh.c mac80211: make master iface not wireless 2008-09-24 16:18:00 -04:00
mesh.h mac80211: mesh portal functionality support 2008-09-24 16:18:02 -04:00
michael.c mac80211: remove ieee80211_get_hdr_info 2008-07-08 14:16:01 -04:00
michael.h mac80211: remove ieee80211_get_hdr_info 2008-07-08 14:16:01 -04:00
mlme.c mac80211: convert to %pM away from print_mac 2008-10-27 17:06:16 -07:00
rate.c mac80211: clean up rate control API 2008-09-24 16:18:03 -04:00
rate.h mac80211: add the 'minstrel' rate control algorithm 2008-10-06 18:14:57 -04:00
rc80211_minstrel_debugfs.c mac80211: correct warnings in minstrel rate control algorithm 2008-10-27 17:46:11 -04:00
rc80211_minstrel.c mac80211: add the 'minstrel' rate control algorithm 2008-10-06 18:14:57 -04:00
rc80211_minstrel.h mac80211: add the 'minstrel' rate control algorithm 2008-10-06 18:14:57 -04:00
rc80211_pid_algo.c mac80211: clean up rate control API 2008-09-24 16:18:03 -04:00
rc80211_pid_debugfs.c mac80211: move TX info into skb->cb 2008-05-21 21:48:11 -04:00
rc80211_pid.h mac80211: clean up rate control API 2008-09-24 16:18:03 -04:00
rx.c mac80211: convert to %pM away from print_mac 2008-10-27 17:06:16 -07:00
scan.c mac80211: Fix scan RX processing oops 2008-10-14 21:08:11 -04:00
spectmgmt.c mac80211: move frame TX function 2008-09-11 15:53:39 -04:00
sta_info.c mac80211: convert to %pM away from print_mac 2008-10-27 17:06:16 -07:00
sta_info.h mac80211: fix debugfs lockup 2008-10-14 20:46:41 -04:00
tkip.c mac80211: convert to %pM away from print_mac 2008-10-27 17:06:16 -07:00
tkip.h mac80211: tkip.c consolidate tkip IV writing in helper 2008-06-14 12:18:13 -04:00
tx.c mac80211: convert to %pM away from print_mac 2008-10-27 17:06:16 -07:00
util.c mac80211: fix HT information element parsing 2008-10-14 20:47:15 -04:00
wep.c mac80211: free up 2 bytes in skb->cb 2008-10-06 18:14:57 -04:00
wep.h mac80211: a few code cleanups 2008-05-07 15:02:11 -04:00
wext.c ath9k/mac80211: disallow fragmentation in ath9k, report to userspace 2008-10-14 21:12:37 -04:00
wme.c mac80211: convert to %pM away from print_mac 2008-10-27 17:06:16 -07:00
wme.h mac80211: clean up some comments 2008-09-15 16:48:22 -04:00
wpa.c mac80211: convert to %pM away from print_mac 2008-10-27 17:06:16 -07:00
wpa.h mac80211: split ieee80211_txrx_data 2008-03-06 15:30:46 -05:00