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

Conflicts:

	drivers/net/wireless/iwlwifi/iwl-core.c
	drivers/net/wireless/iwlwifi/iwl-sta.c

2008-12-05 22:54:40 -08: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

cfg.c

nl80211: Add frequency configuration (including HT40)

2008-12-05 09:32:11 -05:00

cfg.h

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

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

debugfs_key.c

mac80211: convert to %pM away from print_mac

2008-10-27 17:06:16 -07:00

debugfs_key.h

mac80211: fix key vs. sta locking problems

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

debugfs_netdev.c

mac80211: move bss_conf into vif

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

debugfs_netdev.h

mac80211: revamp virtual interface handling

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

debugfs_sta.c

mac80211: fix a buffer overrun in station debug code

2008-11-10 21:37:39 -08:00

debugfs_sta.h

mac80211: RCU-ify STA info structure access

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

debugfs.c

mac80211: make retry limits part of hw config

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

debugfs.h

[MAC80211]: Add debugfs attributes.

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

event.c

mac80211: convert to %pM away from print_mac

2008-10-27 17:06:16 -07:00

ht.c

mac80211: Use the HT capabilities from the IE instead of the station's caps.

2008-11-25 16:41:36 -05:00

ieee80211_i.h

nl80211: Add frequency configuration (including HT40)

2008-12-05 09:32:11 -05:00

iface.c

cfg80211: handle SIOCGIWMODE/SIOCSIWMODE

2008-12-05 09:32:58 -05:00

Kconfig

mac80211: make Minstrel the default rate control algorithm

2008-11-26 09:47:03 -05:00

key.c

mac80211: convert to %pM away from print_mac

2008-10-27 17:06:16 -07:00

key.h

mac80211: Let drivers have access to TKIP key offets for TX and RX MIC

2008-06-27 09:09:17 -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

nl80211: Add frequency configuration (including HT40)

2008-12-05 09:32:11 -05:00

Makefile

mac80211: add the 'minstrel' rate control algorithm

2008-10-06 18:14:57 -04:00

mesh_hwmp.c

net: remove redundant argument comments

2008-11-21 17:15:03 -08:00

mesh_pathtbl.c

mac80211: mesh portal functionality support

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

mesh_plink.c

mac80211: convert to %pM away from print_mac

2008-10-27 17:06:16 -07:00

mesh.c

wireless: move mesh config length constant

2008-11-10 15:10:16 -05:00

mesh.h

wireless: move mesh config length constant

2008-11-10 15:10:16 -05: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

mac80211: accept empty strings for hidden SSIDs

2008-12-05 09:32:59 -05:00

rate.c

mac80211/drivers: rewrite the rate control API

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

rate.h

mac80211: remove rate_control_clear

2008-10-31 19:00:37 -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

wireless: fix a few sparse warnings

2008-11-10 15:10:17 -05:00

rc80211_minstrel.h

minstrel: improve performance for non-MRR drivers

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

rc80211_pid_algo.c

mac80211: Fix pid rate-setting algorithm to allow rate changes

2008-11-26 09:47:20 -05: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: add sta_notify_ps callback

2008-12-05 09:35:43 -05:00

scan.c

wireless: move mesh config length constant

2008-11-10 15:10:16 -05:00

spectmgmt.c

mac80211: move frame TX function

2008-09-11 15:53:39 -04:00

sta_info.c

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

2008-12-05 22:54:40 -08:00

sta_info.h

mac80211: remove more excess kernel-doc

2008-11-21 11:08:15 -05:00

tkip.c

mac80211: convert to %pM away from print_mac

2008-10-27 17:06:16 -07:00

tkip.h

mac80211: tkip.c consolidate tkip IV writing in helper

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

tx.c

mac80211: tx module cleanup.

2008-12-05 09:35:46 -05:00

util.c

nl80211: Add frequency configuration (including HT40)

2008-12-05 09:32:11 -05:00

wep.c

mac80211: fix unaligned access in ieee80211_wep_encrypt_data

2008-11-26 09:47:51 -05:00

wep.h

mac80211: minor code cleanups

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

wext.c

cfg80211: handle SIOCGIWMODE/SIOCSIWMODE

2008-12-05 09:32:58 -05:00

wme.c

mac80211: Re-enable aggregation

2008-10-31 19:02:14 -04:00

wme.h

mac80211: clean up some comments

2008-09-15 16:48:22 -04:00

wpa.c

mac80211: minor code cleanups

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

wpa.h

mac80211: split ieee80211_txrx_data

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