diff options
| author | David S. Miller <davem@davemloft.net> | 2010-01-13 00:33:49 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-01-13 00:33:49 -0500 |
| commit | ff30b3642c1f56a5ae6522b78e82be867086c637 (patch) | |
| tree | 160f2dfd9d98a0d64ba9eb01574888b04905b58d /drivers/net/wireless/iwlwifi/iwl-4965.c | |
| parent | 9db2f1bec36805e57a003f7bb90e003815d96de8 (diff) | |
| parent | 8c5d9808e95739c9001b852464fd58fd0f583280 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-4965.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-4965.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c index 484c5fdf7c2a..9b4b8b5c7574 100644 --- a/drivers/net/wireless/iwlwifi/iwl-4965.c +++ b/drivers/net/wireless/iwlwifi/iwl-4965.c | |||
| @@ -1961,7 +1961,7 @@ static void iwl4965_rx_reply_tx(struct iwl_priv *priv, | |||
| 1961 | struct ieee80211_tx_info *info; | 1961 | struct ieee80211_tx_info *info; |
| 1962 | struct iwl4965_tx_resp *tx_resp = (void *)&pkt->u.raw[0]; | 1962 | struct iwl4965_tx_resp *tx_resp = (void *)&pkt->u.raw[0]; |
| 1963 | u32 status = le32_to_cpu(tx_resp->u.status); | 1963 | u32 status = le32_to_cpu(tx_resp->u.status); |
| 1964 | int tid = MAX_TID_COUNT; | 1964 | int uninitialized_var(tid); |
| 1965 | int sta_id; | 1965 | int sta_id; |
| 1966 | int freed; | 1966 | int freed; |
| 1967 | u8 *qc = NULL; | 1967 | u8 *qc = NULL; |