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

Conflicts:
	net/ipv4/fib_frontend.c

2010-12-26 22:37:05 -08:00

..

aes_ccm.c

mac80211: Remove redundant checks for NULL before calls to crypto_free_cipher()

2010-11-15 13:26:11 -05:00

aes_ccm.h

…

aes_cmac.c

mac80211: Remove redundant checks for NULL before calls to crypto_free_cipher()

2010-11-15 13:26:11 -05:00

aes_cmac.h

…

agg-rx.c

mac80211: fix RX aggregation locking

2010-11-29 15:30:30 -05:00

agg-tx.c

mac80211: Add timeout to BA session start API

2010-12-15 17:03:59 -05:00

cfg.c

mac80211: Send mesh non-HWMP path selection frames to userspace

2010-12-20 14:46:58 -05:00

cfg.h

…

chan.c

cfg80211/mac80211: use lockdep_assert_held

2010-09-16 15:46:00 -04:00

debugfs_key.c

mac80211: support separate default keys

2010-12-13 15:23:29 -05:00

debugfs_key.h

mac80211: support separate default keys

2010-12-13 15:23:29 -05:00

debugfs_netdev.c

nl80211/mac80211: define and allow configuring mesh element TTL

2010-12-06 16:01:28 -05:00

debugfs_netdev.h

…

debugfs_sta.c

mac80211: Add timeout to BA session start API

2010-12-15 17:03:59 -05:00

debugfs_sta.h

…

debugfs.c

mac80211: refactor debugfs function generation code

2010-11-15 13:24:48 -05:00

debugfs.h

mac80211: refactor debugfs function generation code

2010-11-15 13:24:48 -05:00

driver-ops.h

mac80211 default tx_last_beacon false (congestion)

2010-12-13 15:23:29 -05:00

driver-trace.c

…

driver-trace.h

mac80211: Add antenna configuration

2010-11-16 16:37:05 -05:00

event.c

…

ht.c

mac80211: fix SMPS request

2010-10-13 15:45:23 -04:00

ibss.c

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

2010-12-15 16:33:28 -05:00

ieee80211_i.h

mac80211: check for CONFIG_MAC80211_LEDS in the tpt_led_trigger declaration

2010-12-22 14:36:05 -05:00

iface.c

mac80211: selective throughput LED trigger active

2010-12-22 14:33:37 -05:00

Kconfig

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

2010-12-26 22:37:05 -08:00

key.c

mac80211: support separate default keys

2010-12-13 15:23:29 -05:00

key.h

mac80211: support separate default keys

2010-12-13 15:23:29 -05:00

led.c

mac80211: selective throughput LED trigger active

2010-12-22 14:33:37 -05:00

led.h

mac80211: selective throughput LED trigger active

2010-12-22 14:33:37 -05:00

main.c

mac80211: make LED trigger names available early

2010-12-22 14:33:37 -05:00

Makefile

mac80211: add the minstrel_ht rate control algorithm

2010-06-02 16:12:59 -04:00

mesh_hwmp.c

nl80211/mac80211: define and allow configuring mesh element TTL

2010-12-06 16:01:28 -05:00

mesh_pathtbl.c

nl80211/mac80211: define and allow configuring mesh element TTL

2010-12-06 16:01:28 -05:00

mesh_plink.c

mac80211: Let userspace enable and configure vendor specific path selection.

2010-12-20 14:46:57 -05:00

mesh.c

mac80211: Remove unused third address from mesh address extension header.

2010-12-20 14:49:47 -05:00

mesh.h

mac80211: Remove unused third address from mesh address extension header.

2010-12-20 14:49:47 -05:00

michael.c

…

michael.h

…

mlme.c

mac80211: fix a compiler warning

2010-12-07 17:08:06 -05:00

offchannel.c

mac80211: disable beacon monitor while going offchannel

2010-09-16 15:46:17 -04:00

pm.c

mac80211: assure we also cancel deferred scan request

2010-10-06 16:30:42 -04:00

rate.c

cfg80211/mac80211: improve ad-hoc multicast rate handling

2010-11-24 16:19:35 -05:00

rate.h

mac80211: add the minstrel_ht rate control algorithm

2010-06-02 16:12:59 -04:00

rc80211_minstrel_debugfs.c

llseek: automatically add .llseek fop

2010-10-15 15:53:27 +02:00

rc80211_minstrel_ht_debugfs.c

mac80211: disallow seeks in minstrel debug code

2010-09-16 10:33:17 +02:00

rc80211_minstrel_ht.c

mac80211: Add timeout to BA session start API

2010-12-15 17:03:59 -05:00

rc80211_minstrel_ht.h

minstrel_ht: move minstrel_mcs_groups declaration to header file

2010-06-24 15:42:18 -04:00

rc80211_minstrel.c

minstrel: don't complain about feedback for unrequested rates

2010-07-26 15:09:04 -04:00

rc80211_minstrel.h

minstrel: make the rate control ops reusable from another rc implementation

2010-03-10 17:44:23 -05:00

rc80211_pid_algo.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

rc80211_pid_debugfs.c

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

2010-10-23 11:47:02 -07:00

rc80211_pid.h

…

rx.c

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

2010-12-26 22:37:05 -08:00

scan.c

mac80211: fix sw scan locking

2010-10-07 14:41:27 -04:00

spectmgmt.c

…

sta_info.c

nl80211/mac80211: Report signal average

2010-12-07 16:09:12 -05:00

sta_info.h

mac80211: Add timeout to BA session start API

2010-12-15 17:03:59 -05:00

status.c

mac80211: speed up AP probing using nullfunc frames

2010-12-06 15:58:44 -05:00

tkip.c

mac80211: remove wep dependency

2010-07-08 16:35:50 -04:00

tkip.h

mac80211: remove wep dependency

2010-07-08 16:35:50 -04:00

tx.c

mac80211: add throughput based LED blink trigger

2010-12-22 14:33:37 -05:00

util.c

mac80211: selective throughput LED trigger active

2010-12-22 14:33:37 -05:00

wep.c

mac80211: don't kmalloc 16 bytes

2010-10-11 15:04:23 -04:00

wep.h

mac80211: remove wep dependency

2010-07-08 16:35:50 -04:00

wme.c

mac80211: defines for AC numbers

2010-11-17 16:19:31 -05:00

wme.h

…

work.c

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

2010-12-15 16:33:28 -05:00

wpa.c

mac80211: move packet flags into packet

2010-09-27 15:57:54 -04:00

wpa.h

…