iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
ec18d9a269
linux/net/mac80211
History
David S. Miller 04c9f416e3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	net/batman-adv/bridge_loop_avoidance.c
	net/batman-adv/bridge_loop_avoidance.h
	net/batman-adv/soft-interface.c
	net/mac80211/mlme.c

With merge help from Antonio Quartulli (batman-adv) and
Stephen Rothwell (drivers/net/usb/qmi_wwan.c).

The net/mac80211/mlme.c conflict seemed easy enough, accounting for a
conversion to some new tracing macros.

Signed-off-by: David S. Miller <davem@davemloft.net>
2012-07-10 23:56:33 -07:00
..
aes_ccm.c
aes_ccm.h
aes_cmac.c
aes_cmac.h
agg-rx.c mac80211: clean up debugging 2012-06-24 11:32:29 +02:00
agg-tx.c mac80211: clean up debugging 2012-06-24 11:32:29 +02:00
cfg.c Merge branch 'for-john' of git://git.sipsolutions.net/mac80211-next 2012-06-26 14:27:34 -04:00
cfg.h
chan.c mac80211: allow channel change while mesh is down 2012-06-05 15:21:47 -04:00
debug.h mac80211: trace debug messages 2012-06-24 11:33:18 +02:00
debugfs_key.c simple_open: automatically convert to simple_open() 2012-04-05 15:25:50 -07:00
debugfs_key.h
debugfs_netdev.c mac80211: clean up debugging 2012-06-24 11:32:29 +02:00
debugfs_netdev.h
debugfs_sta.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless 2012-04-12 13:49:28 -04:00
debugfs_sta.h
debugfs.c simple_open: automatically convert to simple_open() 2012-04-05 15:25:50 -07:00
debugfs.h simple_open: automatically convert to simple_open() 2012-04-05 15:25:50 -07:00
driver-ops.h mac80211: rename driver-trace file 2012-06-24 11:32:38 +02:00
event.c
ht.c mac80211: clean up debugging 2012-06-24 11:32:29 +02:00
ibss.c mac80211: clean up debugging 2012-06-24 11:32:29 +02:00
ieee80211_i.h mac80211: clean up debugging 2012-06-24 11:32:29 +02:00
iface.c mac80211: make ieee80211_check_concurrent_iface netdev-independent 2012-06-26 09:37:25 +02:00
Kconfig mac80211: trace debug messages 2012-06-24 11:33:18 +02:00
key.c mac80211: clean up debugging 2012-06-24 11:32:29 +02:00
key.h
led.c
led.h
main.c mac80211: Allow userspace to register for auth frames in IBSS 2012-06-20 20:03:43 +02:00
Makefile mac80211: rename driver-trace file 2012-06-24 11:32:38 +02:00
mesh_hwmp.c net: Fix (nearly-)kernel-doc comments for various functions 2012-07-10 23:13:45 -07:00
mesh_pathtbl.c net: Fix (nearly-)kernel-doc comments for various functions 2012-07-10 23:13:45 -07:00
mesh_plink.c net: Fix (nearly-)kernel-doc comments for various functions 2012-07-10 23:13:45 -07:00
mesh_sync.c mac80211: clean up debugging 2012-06-24 11:32:29 +02:00
mesh.c net: Fix (nearly-)kernel-doc comments for various functions 2012-07-10 23:13:45 -07:00
mesh.h {nl,cfg,mac}80211: implement dot11MeshHWMPconfirmationInterval 2012-06-18 13:55:15 +02:00
michael.c
michael.h
mlme.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-07-10 23:56:33 -07:00
offchannel.c mac80211: rename driver-trace file 2012-06-24 11:32:38 +02:00
pm.c mac80211: fix cleanup if driver suspend callback fails 2012-06-20 17:39:51 +02:00
rate.c simple_open: automatically convert to simple_open() 2012-04-05 15:25:50 -07:00
rate.h mac80211: notify driver of rate control updates 2012-04-10 14:54:08 -04:00
rc80211_minstrel_debugfs.c
rc80211_minstrel_ht_debugfs.c
rc80211_minstrel_ht.c mac80211: correct size the argument to kzalloc in minstrel_ht 2012-07-09 14:59:58 -04:00
rc80211_minstrel_ht.h
rc80211_minstrel.c mac80211: remove hw.conf.channel usage where possible 2012-04-13 14:32:50 -04:00
rc80211_minstrel.h
rc80211_pid_algo.c net: fix assignment of 0/1 to bool variables. 2011-12-19 22:27:29 -05:00
rc80211_pid_debugfs.c
rc80211_pid.h
rx.c net: Fix (nearly-)kernel-doc comments for various functions 2012-07-10 23:13:45 -07:00
scan.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem 2012-06-12 14:25:04 -04:00
spectmgmt.c
sta_info.c mac80211: clean up debugging 2012-06-24 11:32:29 +02:00
sta_info.h mac80211: add missing kernel-doc 2012-06-12 13:56:41 +02:00
status.c mac80211: clean up debugging 2012-06-24 11:32:29 +02:00
tkip.c mac80211: remove TKIP debug 2012-06-22 11:26:58 +02:00
tkip.h
trace.c mac80211: trace debug messages 2012-06-24 11:33:18 +02:00
trace.h mac80211: trace debug messages 2012-06-24 11:33:18 +02:00
tx.c mac80211: remove unused function 2012-06-26 09:35:49 +02:00
util.c mac80211: stop Rx during HW reconfig 2012-06-18 19:18:53 +02:00
wep.c mac80211: fix network header location when adding encryption headers 2012-05-16 12:47:43 -04:00
wep.h mac80211: move RX WEP weak IV counting 2012-03-13 14:54:16 -04:00
wme.c mac80211: save wmm_acm per sdata 2012-06-20 17:35:22 +02:00
wme.h mac80211: save wmm_acm per sdata 2012-06-20 17:35:22 +02:00
wpa.c mac80211: fix network header location when adding encryption headers 2012-05-16 12:47:43 -04:00
wpa.h mac80211: fix tx->skb NULL pointer dereference 2012-01-16 15:01:16 -05:00