Johannes Berg 944b9e375d Merge remote-tracking branch 'mac80211/master' into mac80211-next ...

Pull in mac80211.git to let the next patch apply
without conflicts, also resolving a hwsim conflict.

Conflicts:
	drivers/net/wireless/mac80211_hwsim.c

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

2012-09-06 15:56:02 +02:00

..

aes_ccm.c

mac80211: use AES_BLOCK_SIZE

2011-07-08 11:11:24 -04:00

aes_ccm.h

mac80211: use AES_BLOCK_SIZE

2011-07-08 11:11:24 -04:00

aes_cmac.c

mac80211: simplify buffers in aes_128_cmac_vector

2012-08-20 14:03:18 +02:00

aes_cmac.h

mac80211: fix CMAC races

2011-07-08 11:11:20 -04:00

agg-rx.c

mac80211: clean up debugging

2012-06-24 11:32:29 +02:00

agg-tx.c

mac80211: request TX status for BlockAck Requests

2012-07-07 21:35:42 +02:00

cfg.c

Merge remote-tracking branch 'mac80211/master' into mac80211-next

2012-09-06 15:56:02 +02:00

cfg.h

[MAC80211]: rename ieee80211_cfg.h to cfg.h

2007-10-10 16:52:34 -07:00

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

mac80211: fix debugfs default key links

2012-07-06 08:33:04 +02:00

debugfs_key.h

mac80211: support separate default keys

2010-12-13 15:23:29 -05:00

debugfs_netdev.c

mac80211: clean up debugging

2012-06-24 11:32:29 +02:00

debugfs_netdev.h

mac80211: reduce reliance on netdev

2009-12-21 18:38:52 -05:00

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

mac80211: RCU-ify STA info structure access

2008-03-06 15:30:46 -05:00

debugfs.c

mac80211: remove freq/chantype from debugfs

2012-08-20 14:13:40 +02:00

debugfs.h

simple_open: automatically convert to simple_open()

2012-04-05 15:25:50 -07:00

driver-ops.h

mac80211: support P2P Device abstraction

2012-08-20 13:58:22 +02:00

event.c

cfg80211: use proper allocation flags

2009-07-10 15:01:49 -04:00

ht.c

mac80211: clean up debugging

2012-06-24 11:32:29 +02:00

ibss.c

mac80211: add supported rates change notification in IBSS

2012-08-20 13:31:43 +02:00

ieee80211_i.h

mac80211: pass channel to ieee80211_send_probe_req

2012-08-20 14:13:45 +02:00

iface.c

mac80211: Do not check for valid hw_queues for P2P_DEVICE

2012-09-04 14:16:41 +02:00

Kconfig

mac80211: trace debug messages

2012-06-24 11:33:18 +02:00

key.c

mac80211: remove ieee80211_key_removed

2012-07-09 14:49:15 +02:00

key.h

mac80211: allow driver to disconnect after resume

2011-07-13 14:49:43 -04:00

led.c

leds: Rename led_brightness_set() to led_set_brightness()

2012-07-24 07:52:34 +08:00

led.h

mac80211: selective throughput LED trigger active

2010-12-22 14:33:37 -05:00

main.c

mac80211: convert ops checks to WARN_ON

2012-08-20 14:13:44 +02:00

Makefile

mac80211: rename driver-trace file

2012-06-24 11:32:38 +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: mesh: don't use global channel type

2012-08-20 14:13:38 +02:00

mesh_sync.c

mac80211: clean up debugging

2012-06-24 11:32:29 +02:00

mesh.c

Merge remote-tracking branch 'mac80211/master' into mac80211-next

2012-09-06 15:56:02 +02:00

mesh.h

mac80211: clean up mpath_move_to_queue()

2012-08-20 13:25:05 +02: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

Merge remote-tracking branch 'mac80211/master' into mac80211-next

2012-09-06 15:56:02 +02:00

offchannel.c

mac80211: use list_move instead of list_del/list_add

2012-09-06 11:55:47 +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: use oper_channel in rate init

2012-08-20 14:13:41 +02:00

rc80211_minstrel_debugfs.c

net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules

2011-10-31 19:30:30 -04:00

rc80211_minstrel_ht_debugfs.c

net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules

2011-10-31 19:30:30 -04:00

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

minstrel_ht: move minstrel_mcs_groups declaration to header file

2010-06-24 15:42:18 -04:00

rc80211_minstrel.c

mac80211: remove hw.conf.channel usage where possible

2012-04-13 14:32:50 -04:00

rc80211_minstrel.h

minstrel_ht: fixed rate mode through debugfs

2011-06-01 15:12:29 -04:00

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

net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules

2011-10-31 19:30:30 -04:00

rc80211_pid.h

Fix common misspellings

2011-03-31 11:26:23 -03:00

rx.c

mac80211: don't use kerneldoc for ieee80211_add_rx_radiotap_header

2012-09-05 15:55:27 +02:00

scan.c

Merge remote-tracking branch 'mac80211/master' into mac80211-next

2012-09-06 15:56:02 +02:00

spectmgmt.c

mac80211: Remove unnecessary OOM logging messages

2011-09-13 15:45:02 -04:00

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: support P2P Device abstraction

2012-08-20 13:58:22 +02:00

tkip.c

mac80211: remove TKIP debug

2012-06-22 11:26:58 +02:00

tkip.h

mac80211: fix TKIP races, make API easier to use

2011-07-08 11:11:19 -04:00

trace.c

mac80211: trace debug messages

2012-06-24 11:33:18 +02:00

trace.h

mac80211: don't assume channel is set in tracing

2012-08-20 14:13:42 +02:00

tx.c

Merge remote-tracking branch 'mac80211/master' into mac80211-next

2012-09-06 15:56:02 +02:00

util.c

mac80211: pass channel to ieee80211_send_probe_req

2012-08-20 14:13:45 +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