John W. Linville d9b8ae6bd8 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem ...

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-testmode.c

2012-04-26 15:03:48 -04:00

..

aes_ccm.c

…

aes_ccm.h

…

aes_cmac.c

…

aes_cmac.h

…

agg-rx.c

mac80211: optimize aggregation session timeout handling

2012-04-09 16:09:36 -04:00

agg-tx.c

mac80211: add improved HW queue control

2012-04-11 16:23:50 -04:00

cfg.c

mac80211: fix num_mcast_sta counting issues

2012-04-24 14:54:28 -04:00

cfg.h

…

chan.c

mac80211: remove channel type argument from rate_update

2012-04-10 14:54:08 -04: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: rename AP variable num_sta_authorized to num_mcast_sta

2012-04-24 14:54:28 -04: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

cfg80211/mac80211: enable proper device_set_wakeup_enable handling

2012-04-11 16:23:57 -04:00

driver-trace.c

…

driver-trace.h

cfg80211/mac80211: enable proper device_set_wakeup_enable handling

2012-04-11 16:23:57 -04:00

event.c

…

ht.c

mac80211: set HT channel before association

2012-04-10 14:54:07 -04:00

ibss.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2012-04-23 23:15:17 -04:00

ieee80211_i.h

mac80211: rename AP variable num_sta_authorized to num_mcast_sta

2012-04-24 14:54:28 -04:00

iface.c

mac80211: Adds clean sdata helper

2012-04-24 14:56:10 -04:00

Kconfig

mac80211: Implement mesh synchronization framework

2012-04-10 15:20:31 -04:00

key.c

mac80211: clean up asm/unaligned.h inclusion

2012-02-27 14:06:32 -05:00

key.h

…

led.c

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

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

led.h

…

main.c

mac80211: Support on-channel scan option.

2012-04-23 15:28:33 -04:00

Makefile

mac80211: Implement mesh synchronization framework

2012-04-10 15:20:31 -04:00

mesh_hwmp.c

mac80211: fix the assignment of PREQ's MAC address for Proactive RANN

2012-04-12 15:10:31 -04:00

mesh_pathtbl.c

mac80211: fix the assignment of PREQ's MAC address for Proactive RANN

2012-04-12 15:10:31 -04:00

mesh_plink.c

mac80211: don't set mesh peer ht caps if ht disabled

2012-04-23 15:34:07 -04:00

mesh_sync.c

mac80211: fixup for mesh TSF adjustment latency in Toffset setpoint

2012-04-23 15:37:41 -04:00

mesh.c

mac80211: refactor mesh peer rate handling

2012-04-23 15:34:07 -04:00

mesh.h

mac80211: Adds clean sdata helper

2012-04-24 14:56:10 -04:00

michael.c

…

michael.h

…

mlme.c

mac80211: do not scan and monitor connection in parallel

2012-04-13 14:31:49 -04:00

offchannel.c

mac80211: remove dead code

2012-01-04 14:31:47 -05:00

pm.c

mac80211: add explicit monitor interface if needed

2012-04-11 16:23:49 -04: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

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

mac80211: remove hw.conf.channel usage where possible

2012-04-13 14:32:50 -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

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

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

rc80211_pid.h

…

rx.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem

2012-04-26 15:03:48 -04:00

scan.c

mac80211: Support on-channel scan option.

2012-04-23 15:28:33 -04:00

spectmgmt.c

mac80211: Remove unnecessary OOM logging messages

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

sta_info.c

mac80211: fix num_mcast_sta counting issues

2012-04-24 14:54:28 -04:00

sta_info.h

mac80211: Implement mesh synchronization framework

2012-04-10 15:20:31 -04:00

status.c

mac80211: fix an issue in ieee80211_tx_info count field management

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

tkip.c

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

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

tkip.h

…

tx.c

mac80211: rename AP variable num_sta_authorized to num_mcast_sta

2012-04-24 14:54:28 -04:00

util.c

mac80211: check for non-managed interface

2012-04-24 14:54:27 -04:00

wep.c

mac80211: linearize SKBs as needed for crypto

2012-03-13 14:54:17 -04:00

wep.h

mac80211: move RX WEP weak IV counting

2012-03-13 14:54:16 -04:00

wme.c

mac80211: use IEEE80211_NUM_ACS

2012-04-10 14:56:10 -04:00

wme.h

mac80211: make ieee80211_downgrade_queue static

2012-04-10 14:54:06 -04:00

work.c

mac80211: protect ->scanning by mutex in ieee80211_work_work()

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

wpa.c

mac80211: linearize SKBs as needed for crypto

2012-03-13 14:54:17 -04:00

wpa.h

mac80211: fix tx->skb NULL pointer dereference

2012-01-16 15:01:16 -05:00