diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-29 12:11:24 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-29 12:11:24 -0700 |
| commit | da8e5aa21e037be02e0752e80b9444ff60185a3f (patch) | |
| tree | f99d040e1f23e2d329488765440c52c89631fc75 /drivers/net/wireless/iwlwifi/iwl-4965.c | |
| parent | a43f007ba19cef4fac953d9e860e8a668e042e2d (diff) | |
| parent | 9030b3dd671d672f5fcc91c2ec48f02082310af4 (diff) | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (22 commits)
Fix ethernet multicast for ucc_geth.
netdrvr/pcmcia: use IRQ_TYPE_DYNAMIC_SHARING flag for irq.Attributes.
FEC - fast ethernet controller for mpc52xx
ehea: add kexec support
e1000e: Remove legacy jumbo frame receive code
e1000e: Re-enable SECRC - crc stripping
e1000e: Fix PBA calculation for jumbo frame packets
e1000e: Fix jumbo frame receive code.
drivers/net/irda/au1k_ir: fix obvious irq handler bugs
ipg: Kconfig whitepaces/tab damages
ipg: missing Kconfig dependency
r8169: remove poll_locked logic
r8169: napi config
[PATCH] iwl3945: fix direct scan problem
[PATCH] iwl3945: cancel scan on rxon command
[PATCH] iwl4965: fix scan problem
[PATCH] iwl4965: fix driver hang related to hardware scan
[PATCH] iwlwifi: fix sending probe request in iwl 4965
[PATCH] rtl8187: Allow multicast frames
[PATCH] b43/b43legacy: jiffies_round -> jiffies_round_relative
...
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-4965.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-4965.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c index 557deebca1b..891f90d2f01 100644 --- a/drivers/net/wireless/iwlwifi/iwl-4965.c +++ b/drivers/net/wireless/iwlwifi/iwl-4965.c @@ -3232,9 +3232,7 @@ int iwl4965_tx_cmd(struct iwl_priv *priv, struct iwl_cmd *out_cmd, tx->rate_n_flags = iwl_hw_set_rate_n_flags(iwl_rates[rate_index].plcp, rate_flags); - if (ieee80211_is_probe_request(fc)) - tx->tx_flags |= TX_CMD_FLG_TSF_MSK; - else if (ieee80211_is_back_request(fc)) + if (ieee80211_is_back_request(fc)) tx->tx_flags |= TX_CMD_FLG_ACK_MSK | TX_CMD_FLG_IMM_BA_RSP_MASK; #ifdef CONFIG_IWLWIFI_HT @@ -3872,7 +3870,7 @@ static void iwl4965_rx_reply_rx(struct iwl_priv *priv, */ case IEEE80211_STYPE_ASSOC_RESP: case IEEE80211_STYPE_REASSOC_RESP: - if (network_packet && iwl_is_associated(priv)) { + if (network_packet) { #ifdef CONFIG_IWLWIFI_HT u8 *pos = NULL; struct ieee802_11_elems elems; |