Reinette Chatre df29ff3794 iwlwifi: fix merge error ...

This hunk of code was removed in patch "iwlwifi: do not
cancel delayed work inside spin_lock_irqsave" submitted at
http://marc.info/?l=linux-wireless&m=124267503030042&w=2

This same patch in this repo does not remove this hunk.
Remove it here.

Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

2009-06-03 14:05:09 -04:00

..

ath

ath5k: avoid leaking mutex in ath5k_config

2009-06-03 14:05:08 -04:00

b43

wireless: move some utility functions from mac80211 to cfg80211

2009-05-22 14:06:02 -04:00

b43legacy

b43/legacy: fix beacon change processing

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

hostap

net: remove needless (now buggy) & from dev->dev_addr

2009-05-17 11:59:47 -07:00

ipw2x00

Wireless: remove driver_data direct access of struct device

2009-05-06 15:15:01 -04:00

iwlwifi

iwlwifi: fix merge error

2009-06-03 14:05:09 -04:00

iwmc3200wifi

iwmc3200wifi: fix link error when CFG80211 is not selected

2009-05-25 22:41:51 -07:00

libertas

net/libertas: make SPI interface big endian aware

2009-06-03 14:05:08 -04:00

libertas_tf

mac80211: unify config_interface and bss_info_changed

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

orinoco

orinoco: correct timeout logic in __orinoco_hw_set_tkip_key()

2009-04-16 10:39:17 -04:00

p54

p54: Use SKB list handling helpers instead of by-hand code.

2009-05-28 00:48:16 -07:00

prism54

dma-mapping: replace all DMA_32BIT_MASK macro with DMA_BIT_MASK(32)

2009-04-07 08:31:11 -07:00

rt2x00

rt2x00: Add new rt2800usb USB ID's

2009-06-03 14:05:08 -04:00

rtl818x

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

2009-06-03 02:43:41 -07:00

wl12xx

wireless: WL12XX should depend on GENERIC_HARDIRQS

2009-05-11 15:23:54 -04:00

zd1211rw

zd1211rw: Replace ZD_CS_MULTICAST with ZD_CS_NO_ACK

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

adm8211.c

mac80211: unify config_interface and bss_info_changed

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

adm8211.h

…

airo_cs.c

…

airo.c

airo: fix airo_get_encode{,ext} buffer overflow like I mean it...

2009-05-20 14:29:54 -04:00

airo.h

…

arlan-main.c

Merge branch 'linus' into percpu-cpumask-x86-for-linus-2

2009-03-28 04:26:01 +01:00

arlan-proc.c

…

arlan.h

…

at76c50x-usb.c

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

2009-06-03 02:43:41 -07:00

at76c50x-usb.h

…

atmel_cs.c

Wireless: remove driver_data direct access of struct device

2009-05-06 15:15:01 -04:00

atmel_pci.c

…

atmel.c

atmel: fix netdev ops conversion

2009-04-21 02:08:51 -07:00

atmel.h

…

i82586.h

…

i82593.h

…

Kconfig

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

2009-06-03 02:43:41 -07:00

mac80211_hwsim.c

mac80211_hwsim: Group radios

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

Makefile

iwmc3200wifi: Add new Intel Wireless Multicomm 802.11 driver

2009-05-22 14:06:02 -04:00

mwl8k.c

mac80211: move HT operation mode BSS info

2009-05-11 15:23:57 -04:00

netwave_cs.c

…

ray_cs.c

net: remove needless (now buggy) & from dev->dev_addr

2009-05-17 11:59:47 -07:00

ray_cs.h

…

rayctl.h

…

rndis_wlan.c

rndis_wlan: do not try to restore wpa keys using add_wep_key()

2009-05-22 14:06:04 -04:00

strip.c

wireless: fix to set dev->broadcast correctly

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

wavelan_cs.c

wavelan: Remove bogus debugging on skb->next being non-NULL.

2009-05-27 17:27:01 -07:00

wavelan_cs.h

…

wavelan_cs.p.h

wavelan: convert to internal net_device_stats

2009-03-21 22:43:58 -07:00

wavelan.c

wavelan: Remove bogus debugging on skb->next being non-NULL.

2009-05-27 17:27:01 -07:00

wavelan.h

…

wavelan.p.h

wireless: convert wavelan to net_device_ops

2009-03-27 00:46:46 -07:00

wl3501_cs.c

wl3501: convert to net_device_ops

2009-03-21 22:51:20 -07:00

wl3501.h

wl3501: convert to internal net_device_stats

2009-03-21 22:51:19 -07:00

zd1201.c

wireless: remove duplicated .ndo_set_mac_address

2009-03-29 13:52:21 -07:00

zd1201.h

zd1201: convert to internal net_device_stats

2009-03-21 22:51:20 -07:00