Linus Torvalds
c44eaf41a5
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
...
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (34 commits)
net: Add support for SMSC LAN9530, LAN9730 and LAN89530
mlx4_en: Restoring RX buffer pointer in case of failure
mlx4: Sensing link type at device initialization
ipv4: Fix "Set rt->rt_iif more sanely on output routes."
MAINTAINERS: add entry for Xen network backend
be2net: Fix suspend/resume operation
be2net: Rename some struct members for clarity
pppoe: drop PPPOX_ZOMBIEs in pppoe_flush_dev
dsa/mv88e6131: add support for mv88e6085 switch
ipv6: Enable RFS sk_rxhash tracking for ipv6 sockets (v2)
be2net: Fix a potential crash during shutdown.
bna: Fix for handling firmware heartbeat failure
can: mcp251x: Allow pass IRQ flags through platform data.
smsc911x: fix mac_lock acquision before calling smsc911x_mac_read
iwlwifi: accept EEPROM version 0x423 for iwl6000
rt2x00: fix cancelling uninitialized work
rtlwifi: Fix some warnings/bugs
p54usb: IDs for two new devices
wl12xx: fix potential buffer overflow in testmode nvs push
zd1211rw: reset rx idle timer from tasklet
...
2011-04-11 07:27:24 -07:00
..
aes_ccm.c
aes_ccm.h
aes_cmac.c
aes_cmac.h
agg-rx.c
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
2011-01-28 16:23:14 -05:00
agg-tx.c
mac80211: allow advertising correct maximum aggregate size
2011-01-19 11:36:12 -05:00
cfg.c
mac80211: implement support for cfg80211_ops->{get,set}_ringparam
2011-03-11 15:34:10 -05:00
cfg.h
chan.c
mac80211: fix channel type recalculation with HT and non-HT interfaces
2011-03-14 14:46:58 -04:00
debugfs.c
mac80211: Add power to debugfs.
2011-02-18 16:53:21 -05:00
debugfs.h
debugfs_key.c
debugfs_key.h
debugfs_netdev.c
mac80211: Add testing functionality for TKIP
2011-02-03 16:45:29 -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
driver-ops.h
mac80211: implement support for cfg80211_ops->{get,set}_ringparam
2011-03-11 15:34:10 -05:00
driver-trace.c
driver-trace.h
mac80211: implement support for cfg80211_ops->{get,set}_ringparam
2011-03-11 15:34:10 -05:00
event.c
ht.c
mac80211: copy peer MCS TX parameters
2011-02-25 15:33:39 -05:00
ibss.c
mac80211: remove IBSS merge delay
2011-02-25 15:32:34 -05:00
ieee80211_i.h
Fix common misspellings
2011-03-31 11:26:23 -03:00
iface.c
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2011-03-03 21:27:42 -08:00
Kconfig
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
2011-03-04 14:10:40 -05:00
key.c
mac80211: fix possible NULL pointer dereference
2011-03-28 15:42:02 -04:00
key.h
mac80211: remove unused macros
2011-03-07 13:48:30 -05:00
led.c
mac80211: remove stray extern
2011-01-05 16:07:12 -05:00
led.h
mac80211: selective throughput LED trigger active
2010-12-22 14:33:37 -05:00
main.c
mac80211: Add log message to ieee80211_restart_hw()
2011-03-07 13:51:04 -05:00
Makefile
mesh.c
cfg80211: Extend channel to frequency mapping for 802.11j
2011-01-21 15:34:17 -05:00
mesh.h
mac80211: Remove unused third address from mesh address extension header.
2010-12-20 14:49:47 -05:00
mesh_hwmp.c
mesh_pathtbl.c
Fix common misspellings
2011-03-31 11:26:23 -03:00
mesh_plink.c
mac80211: Let userspace enable and configure vendor specific path selection.
2010-12-20 14:46:57 -05:00
michael.c
michael.h
mlme.c
mac80211: do not enable ps if 802.1x controlled port is unblocked
2011-03-11 14:15:37 -05:00
offchannel.c
mac80211: Optimize scans on current operating channel.
2011-02-04 16:30:32 -05:00
pm.c
rate.c
rate.h
rc80211_minstrel.c
rc80211_minstrel.h
rc80211_minstrel_debugfs.c
rc80211_minstrel_ht.c
Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6
2011-04-07 11:14:49 -07:00
rc80211_minstrel_ht.h
rc80211_minstrel_ht_debugfs.c
rc80211_pid.h
Fix common misspellings
2011-03-31 11:26:23 -03:00
rc80211_pid_algo.c
rc80211_pid_debugfs.c
rx.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
2011-04-11 07:27:24 -07:00
scan.c
mac80211: fix scan race, simplify code
2011-03-07 13:51:04 -05:00
spectmgmt.c
sta_info.c
Fix common misspellings
2011-03-31 11:26:23 -03:00
sta_info.h
Fix common misspellings
2011-03-31 11:26:23 -03:00
status.c
mac80211: support direct offchannel TX offload
2011-02-25 15:33:40 -05:00
tkip.c
tkip.h
tx.c
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2011-03-18 10:37:40 -07:00
util.c
Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
2011-02-18 17:03:41 -05:00
wep.c
wep.h
wme.c
mac80211: cleanup select_queue
2010-12-22 15:44:22 -05:00
wme.h
work.c
mac80211: remove unused macros
2011-03-07 13:48:30 -05:00
wpa.c
mac80211: Add testing functionality for TKIP
2011-02-03 16:45:29 -05:00
wpa.h