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

Conflicts:
	drivers/net/bonding/bond_main.c
	drivers/net/via-velocity.c
	drivers/net/wireless/iwlwifi/iwl-agn.c

2010-04-06 23:53:30 -07:00

..

.gitignore

wireless: support internal statically compiled regulatory database

2009-12-21 18:56:10 -05:00

chan.c

cfg80211: add remain-on-channel command

2009-12-28 16:55:02 -05:00

core.c

nl80211: add power save commands

2010-02-19 15:52:40 -05:00

core.h

cfg80211/mac80211: allow registering for and sending action frames

2010-02-15 16:14:15 -05:00

db.txt

wireless: support internal statically compiled regulatory database

2009-12-21 18:56:10 -05:00

debugfs.c

cfg80211/mac80211: use debugfs_remove_recursive

2009-10-30 16:49:18 -04:00

debugfs.h

cfg80211/mac80211: use debugfs_remove_recursive

2009-10-30 16:49:18 -04:00

ethtool.c

…

ethtool.h

…

genregdb.awk

wireless: fix comments in genregdb.awk

2009-12-25 16:35:43 -08:00

ibss.c

wireless : use a dedicated workqueue for cfg80211.

2009-11-28 15:05:00 -05:00

Kconfig

wireless: remove CONFIG_WIRELESS_OLD_REGULATORY

2009-12-28 16:31:37 -05:00

lib80211_crypt_ccmp.c

lib80211: Cosmetics - make room for MIC/CRC near the actual calculation

2010-02-02 16:03:38 -05:00

lib80211_crypt_tkip.c

lib80211: Introduce TKIP_HDR_LEN define for code clarity

2010-02-02 16:03:38 -05:00

lib80211_crypt_wep.c

…

lib80211.c

…

Makefile

wireless: support internal statically compiled regulatory database

2009-12-21 18:56:10 -05:00

mlme.c

cfg80211: Add connection quality monitoring support to nl80211

2010-03-24 16:02:37 -04:00

nl80211.c

cfg80211: Add connection quality monitoring support to nl80211

2010-03-24 16:02:37 -04:00

nl80211.h

cfg80211: Add connection quality monitoring support to nl80211

2010-03-24 16:02:37 -04:00

radiotap.c

wireless: update radiotap parser

2010-02-08 16:50:53 -05:00

reg.c

wireless: convert reg_regdb_search_lock to mutex

2010-03-30 15:37:20 -04:00

reg.h

cfg80211: add regulatory hint disconnect support

2010-02-01 15:40:06 -05:00

regdb.h

wireless: support internal statically compiled regulatory database

2009-12-21 18:56:10 -05:00

scan.c

cfg80211: export cfg80211_find_ie

2010-01-26 11:53:20 -05:00

sme.c

cfg80211: add regulatory hint disconnect support

2010-02-01 15:40:06 -05:00

sysfs.c

cfg80211: export multiple MAC addresses in sysfs

2010-01-22 16:11:16 -05:00

sysfs.h

…

util.c

mac80211: Account HT Control field in Data frame hdrlen according to 802.11n-2009

2010-01-22 16:11:27 -05:00

wext-compat.c

nl80211: add power save commands

2010-02-19 15:52:40 -05:00

wext-compat.h

…

wext-core.c

net/wireless/wext-core.c: Use IW_EVENT_IDX macro

2010-03-23 16:50:27 -04:00

wext-priv.c

…

wext-proc.c

net: spread __net_init, __net_exit

2010-01-17 19:16:02 -08:00

wext-sme.c

…

wext-spy.c

…