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

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-3945.h
	drivers/net/wireless/iwlwifi/iwl-tx.c
	drivers/net/wireless/iwlwifi/iwl3945-base.c

2009-07-30 19:22:43 -07:00

..

aes_ccm.c

mac80211: aes_ccm.c remove crypto wrapper and extra args

2008-07-08 14:16:02 -04:00

aes_ccm.h

mac80211: pass scratch buffer directly, remove additional pointers

2008-07-08 14:16:02 -04:00

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: remove master netdev

2009-07-24 15:05:30 -04:00

cfg.c

mac80211: fix sparse warning

2009-07-24 15:05:01 -04:00

cfg.h

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

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

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: rework MLME for multiple authentications

2009-07-10 15:02:30 -04:00

debugfs_netdev.h

mac80211: revamp virtual interface handling

2008-07-14 14:30:07 -04:00

debugfs_sta.c

mac80211: improve per-sta debugfs

2009-07-10 14:57:54 -04:00

debugfs_sta.h

mac80211: RCU-ify STA info structure access

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

debugfs.c

mac80211: remove master netdev

2009-07-24 15:05:30 -04:00

debugfs.h

[MAC80211]: Add debugfs attributes.

2007-05-05 11:46:38 -07:00

driver-ops.h

mac80211: driver operation debugging

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

driver-trace.c

mac80211: driver operation debugging

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

driver-trace.h

mac80211: fix spare warnings in driver-trace.h

2009-07-24 15:05:27 -04:00

event.c

cfg80211: use proper allocation flags

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

ht.c

cfg80211: clean up includes

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

ibss.c

cfg80211: rework key operation

2009-07-24 15:05:09 -04:00

ieee80211_i.h

mac80211: remove master netdev

2009-07-24 15:05:30 -04:00

iface.c

mac80211: remove master netdev

2009-07-24 15:05:30 -04:00

Kconfig

mac80211: driver operation debugging

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

key.c

mac80211: fix todo lock

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

key.h

nl80211: Add RSC configuration for new keys

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

led.c

mac80211: rename files

2008-04-08 16:44:45 -04:00

led.h

mac80211: rename files

2008-04-08 16:44:45 -04:00

main.c

mac80211: remove master netdev

2009-07-24 15:05:30 -04:00

Makefile

mac80211: driver operation debugging

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

mesh_hwmp.c

mac80211: Fix regression in mesh forwarding path.

2009-07-24 15:05:31 -04:00

mesh_pathtbl.c

mac80211: Fix regression in mesh forwarding path.

2009-07-24 15:05:31 -04:00

mesh_plink.c

mac80211: cancel/restart all timers across suspend/resume

2009-05-20 14:46:25 -04:00

mesh.c

mac80211: mesh: fix two small problems

2009-07-24 15:05:10 -04:00

mesh.h

mac80211: push rx status into skb->cb

2009-07-10 14:57:54 -04: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 branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2009-07-30 19:22:43 -07:00

pm.c

mac80211: fix suspend

2009-07-29 14:52:01 -04:00

rate.c

mac80211: remove master netdev

2009-07-24 15:05:30 -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

mac80211: add helper for management / no-ack frame rate decision

2009-07-24 15:05:16 -04:00

rc80211_minstrel.h

minstrel: improve performance for non-MRR drivers

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

rc80211_pid_algo.c

mac80211: add helper for management / no-ack frame rate decision

2009-07-24 15:05:16 -04: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

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

2009-07-30 19:22:43 -07:00

scan.c

mac80211: remove master netdev

2009-07-24 15:05:30 -04:00

spectmgmt.c

mac80211: move channel switch code

2009-05-20 14:46:25 -04:00

sta_info.c

mac80211: extend sta kdoc - explain when they are added

2009-06-03 14:06:15 -04:00

sta_info.h

mac80211: improve per-sta debugfs

2009-07-10 14:57:54 -04:00

tkip.c

mac80211: add driver ops wrappers

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

tkip.h

mac80211: tkip.c consolidate tkip IV writing in helper

2008-06-14 12:18:13 -04:00

tx.c

mac80211: Fix regression in mesh forwarding path.

2009-07-24 15:05:31 -04:00

util.c

mac80211: remove master netdev

2009-07-24 15:05:30 -04:00

wep.c

cfg80211: rework key operation

2009-07-24 15:05:09 -04:00

wep.h

cfg80211: rework key operation

2009-07-24 15:05:09 -04:00

wext.c

cfg80211: implement get_wireless_stats

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

wme.c

mac80211: remove master netdev

2009-07-24 15:05:30 -04:00

wme.h

mac80211: remove master netdev

2009-07-24 15:05:30 -04:00

wpa.c

cfg80211: use proper allocation flags

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

wpa.h

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

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