Zhu Yi 3e2236c108 iwl3945: fix merge mistake for packet injection ...

We should allow packets transmission in monitor mode for 3945. The
patch fixes a merge error with 2.6.26 kernel.

Signed-off-by: Zhu Yi <yi.zhu@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

2008-08-04 15:09:14 -04:00

..

iwl3945-base.c

iwl3945: fix merge mistake for packet injection

2008-08-04 15:09:14 -04:00

iwl-3945-commands.h

iwlwifi: iwl3945 remove 4965 commands

2008-03-25 16:41:54 -04:00

iwl-3945-core.h

iwlwifi: add struct iwl_cfg

2008-03-07 16:03:00 -05:00

iwl-3945-debug.h

iwlwifi: update copyright year

2008-03-13 19:32:32 -04:00

iwl-3945-hw.h

iwlwifi: 3945 remove unused SCD definitions

2008-05-07 15:02:20 -04:00

iwl-3945-io.h

iwlwifi: update copyright year

2008-03-13 19:32:32 -04:00

iwl-3945-led.c

iwlwifi: Don't use buffer allocated on the stack for led names

2008-08-04 15:09:11 -04:00

iwl-3945-led.h

iwlwifi: Don't use buffer allocated on the stack for led names

2008-08-04 15:09:11 -04:00

iwl-3945-rs.c

mac80211: move TX info into skb->cb

2008-05-21 21:48:11 -04:00

iwl-3945-rs.h

iwlwifi: move rate registration to module load

2008-04-01 17:13:19 -04:00

iwl-3945.c

iwlwifi: fix checkpatch.pl errors

2008-08-04 15:09:11 -04:00

iwl-3945.h

iwlwifi: Fix LEDs for 3945

2008-07-14 14:53:00 -04:00

iwl-4965-hw.h

iwlwifi: differentiate 4965 and 5000 hw ampdu queues number

2008-07-14 14:52:59 -04:00

iwl-4965.c

iwlwifi: implement iwl5000_calc_rssi

2008-08-04 15:09:12 -04:00

iwl-5000-hw.h

iwlwifi: differentiate 4965 and 5000 hw ampdu queues number

2008-07-14 14:52:59 -04:00

iwl-5000.c

iwlwifi: grap nic access before accessing periphery registers

2008-08-04 15:09:13 -04:00

iwl-agn-rs.c

iwlwifi: fix checkpatch.pl errors

2008-08-04 15:09:11 -04:00

iwl-agn-rs.h

iwlwifi: kill iwl4965_fill_rs_info

2008-08-04 15:09:08 -04:00

iwl-agn.c

iwlwifi: fix unhandled interrupt when HW rfkill is on

2008-08-04 15:09:13 -04:00

iwl-calib.c

iwlwifi: move RX stats to core, and move temperature to handler

2008-06-30 17:37:39 -04:00

iwl-calib.h

iwlwifi: move RX stats to core, and move temperature to handler

2008-06-30 17:37:39 -04:00

iwl-commands.h

iwlwifi: implement iwl5000_calc_rssi

2008-08-04 15:09:12 -04:00

iwl-core.c

iwlwifi: fix checkpatch.pl errors

2008-08-04 15:09:11 -04:00

iwl-core.h

iwlwifi: implement iwl5000_calc_rssi

2008-08-04 15:09:12 -04:00

iwl-csr.h

iwlwifi: HW bug fixes

2008-08-04 15:09:12 -04:00

iwl-debug.h

iwlwifi: fix checkpatch.pl errors

2008-08-04 15:09:11 -04:00

iwl-debugfs.c

iwlwifi: fix checkpatch.pl errors

2008-08-04 15:09:11 -04:00

iwl-dev.h

iwlwifi: memory allocation optimization

2008-08-04 15:09:12 -04:00

iwl-eeprom.c

iwlwifi: fix checkpatch.pl errors

2008-08-04 15:09:11 -04:00

iwl-eeprom.h

iwlwifi-5000: implement initial calibration for 5000

2008-06-03 15:00:23 -04:00

iwl-fh.h

iwlwifi: move Flow Handlers define to iwl-fh.h

2008-05-07 15:02:20 -04:00

iwl-hcmd.c

iwlwifi: memory allocation optimization

2008-08-04 15:09:12 -04:00

iwl-helpers.h

mac80211: add helpers for frame control testing

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

iwl-io.h

iwlwifi: improve NIC i/o debug prints information

2008-03-27 16:03:17 -04:00

iwl-led.c

iwlwifi: Don't use buffer allocated on the stack for led names

2008-08-04 15:09:11 -04:00

iwl-led.h

iwlwifi: Don't use buffer allocated on the stack for led names

2008-08-04 15:09:11 -04:00

iwl-power.c

iwlwifi: corrects power_level in sysfs

2008-08-04 15:09:06 -04:00

iwl-power.h

iwlwifi: corrects power_level in sysfs

2008-08-04 15:09:06 -04:00

iwl-prph.h

iwlwifi: HW bug fixes

2008-08-04 15:09:12 -04:00

iwl-rfkill.c

iwlwifi: remove input device and fix rfkill state

2008-07-08 10:21:35 -04:00

iwl-rfkill.h

iwlwifi: remove input device and fix rfkill state

2008-07-08 10:21:35 -04:00

iwl-rx.c

iwlwifi: implement iwl5000_calc_rssi

2008-08-04 15:09:12 -04:00

iwl-scan.c

iwlwifi: decrement rx skb counter in scan abort handler

2008-08-04 15:09:13 -04:00

iwl-spectrum.h

iwlwifi: update copyright year

2008-03-13 19:32:32 -04:00

iwl-sta.c

iwlwifi: fix checkpatch.pl errors

2008-08-04 15:09:11 -04:00

iwl-sta.h

iwlwifi: better station table maintenance

2008-06-30 17:37:38 -04:00

iwl-tx.c

iwlwifi: memory allocation optimization

2008-08-04 15:09:12 -04:00

Kconfig

iwlwifi: rename 4965 to AGN

2008-08-04 15:09:11 -04:00

Makefile

iwlwifi: rename 4965 to AGN

2008-08-04 15:09:11 -04:00