davidlt/kernel-ark
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
f4e0b4c5e1
kernel-ark/net/mac80211
History
David S. Miller 24bc518a68 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/wireless/iwlwifi/pcie/tx.c

Minor iwlwifi conflict in TX queue disabling between 'net', which
removed a bogus warning, and 'net-next' which added some status
register poking code.

Signed-off-by: David S. Miller <davem@davemloft.net>
2012-11-25 12:49:17 -05:00
..
aes_ccm.c
aes_ccm.h
aes_cmac.c mac80211: expose AES-CMAC subkey calculation 2012-10-23 19:52:52 +02:00
aes_cmac.h
agg-rx.c
agg-tx.c mac80211: don't send delBA on addBA failure 2012-09-21 16:14:14 +02:00
cfg.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-11-17 22:00:43 -05:00
cfg.h
chan.c mac80211: add channel context iterator 2012-10-17 11:02:10 +02:00
debug.h
debugfs_key.c mac80211: fix debugfs default key links 2012-07-06 08:33:04 +02:00
debugfs_key.h
debugfs_netdev.c mac80211: make client powersave independent of interface type 2012-10-19 15:43:51 +02:00
debugfs_netdev.h
debugfs_sta.c
debugfs_sta.h
debugfs.c mac80211: make reset debugfs depend on CONFIG_PM 2012-09-19 08:20:24 +02:00
debugfs.h mac80211: use __printf attribute in debugfs 2012-10-18 09:01:57 +02:00
driver-ops.h mac80211: introduce new ieee80211_ops 2012-10-16 20:22:42 +02:00
event.c
ht.c
ibss.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-11-25 12:49:17 -05:00
ieee80211_i.h Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-11-17 22:00:43 -05:00
iface.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless 2012-10-23 11:41:46 -04:00
Kconfig mac80211: fix copy-paste typo in Kconfig 2012-10-18 09:10:28 +02:00
key.c mac80211: use synchronize_net() on key destroying 2012-09-06 17:29:23 +02:00
key.h
led.c leds: Rename led_brightness_set() to led_set_brightness() 2012-07-24 07:52:34 +08:00
led.h
main.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-11-17 22:00:43 -05:00
Makefile mac80211: VHT peer STA caps 2012-10-17 11:02:14 +02:00
mesh_hwmp.c mac80211: clean up mpath_move_to_queue() 2012-08-20 13:25:05 +02:00
mesh_pathtbl.c mac80211: clean up mpath_move_to_queue() 2012-08-20 13:25:05 +02:00
mesh_plink.c mac80211: move out the non-statistics variable estab_plinks from mesh_stat 2012-10-17 11:02:13 +02:00
mesh_sync.c mac80211: remove unimplemented mesh vendor sync 2012-10-18 09:01:56 +02:00
mesh.c mac80211: mesh STAs only process mesh beacons 2012-10-23 19:52:52 +02:00
mesh.h mac80211: remove unimplemented mesh vendor sync 2012-10-18 09:01:56 +02:00
michael.c
michael.h
mlme.c Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next 2012-10-29 14:52:04 -04:00
offchannel.c mac80211: use channel contexts 2012-10-17 11:02:09 +02:00
pm.c mac80211: use channel contexts 2012-10-17 11:02:09 +02:00
rate.c
rate.h mac80211: use channel contexts 2012-10-17 11:02:09 +02:00
rc80211_minstrel_debugfs.c
rc80211_minstrel_ht_debugfs.c
rc80211_minstrel_ht.c Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next 2012-07-12 15:21:05 -04:00
rc80211_minstrel_ht.h
rc80211_minstrel.c
rc80211_minstrel.h
rc80211_pid_algo.c
rc80211_pid_debugfs.c
rc80211_pid.h
rx.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless 2012-10-29 16:05:51 -04:00
scan.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-11-17 22:00:43 -05:00
spectmgmt.c
sta_info.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-11-17 22:00:43 -05:00
sta_info.h mac80211: use call_rcu() on sta deletion 2012-09-10 12:44:17 +02:00
status.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-11-17 22:00:43 -05:00
tkip.c
tkip.h
trace.c
trace.h mac80211: complete bss_info tracing 2012-10-25 13:54:09 +02:00
tx.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-11-17 22:00:43 -05:00
util.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-11-17 22:00:43 -05:00
vht.c mac80211: VHT peer STA caps 2012-10-17 11:02:14 +02:00
wep.c
wep.h
wme.c
wme.h
wpa.c Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211 2012-10-17 16:23:33 -04:00
wpa.h