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

Conflicts:
	drivers/scsi/fcoe/fcoe.c

2009-05-18 21:08:20 -07:00

..

aes_ccm.c

…

aes_ccm.h

…

aes_cmac.c

mac80211: 802.11w - Add BIP (AES-128-CMAC)

2009-01-29 16:00:02 -05:00

aes_cmac.h

mac80211: 802.11w - Add BIP (AES-128-CMAC)

2009-01-29 16:00:02 -05:00

agg-rx.c

mac80211: Add a timeout for frames in the RX reorder buffer

2009-05-06 15:15:04 -04:00

agg-tx.c

mac80211: add driver ops wrappers

2009-05-06 15:14:37 -04:00

cfg.c

nl80211: Add RSC configuration for new keys

2009-05-13 15:44:39 -04:00

cfg.h

…

debugfs_key.c

mac80211: 802.11w - Use BIP (AES-128-CMAC)

2009-01-29 16:00:03 -05:00

debugfs_key.h

mac80211: 802.11w - Use BIP (AES-128-CMAC)

2009-01-29 16:00:03 -05:00

debugfs_netdev.c

mac80211: split IBSS/managed code

2009-02-27 14:51:42 -05:00

debugfs_netdev.h

…

debugfs_sta.c

mac80211: 802.11w - STA flag for MFP

2009-01-29 16:00:00 -05:00

debugfs_sta.h

…

debugfs.c

mac80211: make noack test available

2009-05-13 15:44:53 -04:00

debugfs.h

…

driver-ops.h

mac80211: add driver ops wrappers

2009-05-06 15:14:37 -04:00

event.c

nl80211: Add Michael MIC failure event

2009-04-22 16:54:28 -04:00

ht.c

cfg80211: clean up includes

2009-04-22 16:57:17 -04:00

ibss.c

mac80211: IBSS supported rate fixes

2009-05-13 15:44:49 -04:00

ieee80211_i.h

mac80211: make noack test available

2009-05-13 15:44:53 -04:00

iface.c

mac80211: fix scan channel race

2009-05-11 15:23:54 -04:00

Kconfig

mac80211: enable PS by default

2009-04-22 16:57:16 -04:00

key.c

nl80211: Add RSC configuration for new keys

2009-05-13 15:44:39 -04:00

key.h

nl80211: Add RSC configuration for new keys

2009-05-13 15:44:39 -04:00

led.c

…

led.h

…

main.c

mac80211: fix scan channel race

2009-05-11 15:23:54 -04:00

Makefile

mac80211: split IBSS/managed code

2009-02-27 14:51:42 -05:00

mesh_hwmp.c

mac80211: fix RX aggregation timeouts

2009-02-13 13:45:32 -05:00

mesh_pathtbl.c

mac80211: mesh portal functionality support

2008-09-24 16:18:02 -04:00

mesh_plink.c

wireless: restrict to 32 legacy rates

2009-01-29 16:01:09 -05:00

mesh.c

mac80211: unify config_interface and bss_info_changed

2009-05-06 15:14:36 -04:00

mesh.h

mac80211: use cfg80211s BSS infrastructure

2009-02-13 13:45:58 -05:00

michael.c

…

michael.h

…

mlme.c

mac80211: split out and decrease probe wait time

2009-05-13 15:44:45 -04:00

pm.c

mac80211: add driver ops wrappers

2009-05-06 15:14:37 -04:00

rate.c

mac80211: rate control status only for controlled packets

2009-03-27 20:13:15 -04:00

rate.h

mac80211: rate control status only for controlled packets

2009-03-27 20:13:15 -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

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2009-05-18 21:08:20 -07:00

rc80211_minstrel.h

minstrel: improve performance for non-MRR drivers

2008-10-31 19:00:36 -04:00

rc80211_pid_algo.c

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2009-05-18 21:08:20 -07:00

rc80211_pid_debugfs.c

mac80211/drivers: rewrite the rate control API

2008-10-31 19:00:23 -04:00

rc80211_pid.h

mac80211/drivers: rewrite the rate control API

2008-10-31 19:00:23 -04:00

rx.c

mac80211: MFP - Drop unprotected Action frames prior key setup

2009-05-11 15:23:55 -04:00

scan.c

mac80211: improve scan timing

2009-05-11 15:23:56 -04:00

spectmgmt.c

cfg80211: clean up includes

2009-04-22 16:57:17 -04:00

sta_info.c

mac80211: add driver ops wrappers

2009-05-06 15:14:37 -04:00

sta_info.h

mac80211: Add a timeout for frames in the RX reorder buffer

2009-05-06 15:15:04 -04:00

tkip.c

mac80211: add driver ops wrappers

2009-05-06 15:14:37 -04:00

tkip.h

…

tx.c

mac80211: make noack test available

2009-05-13 15:44:53 -04:00

util.c

mac80211: set default QoS values according to spec

2009-05-11 15:23:54 -04:00

wep.c

mac80211: rewrite fragmentation

2009-03-27 20:13:21 -04:00

wep.h

mac80211: minor code cleanups

2008-10-31 18:05:59 -04:00

wext.c

nl80211: Add IEEE 802.1X PAE control for station mode

2009-05-13 15:44:37 -04:00

wme.c

mac80211: make noack test available

2009-05-13 15:44:53 -04:00

wme.h

mac80211: fix aggregation for hardware with ampdu queues

2009-02-27 14:51:42 -05:00

wpa.c

nl80211: Add Michael MIC failure event

2009-04-22 16:54:28 -04:00

wpa.h

mac80211: 802.11w - Add BIP (AES-128-CMAC)

2009-01-29 16:00:02 -05:00