Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 224636
b: refs/heads/master
c: 8d56396
h: refs/heads/master
v: v3
  • Loading branch information
Johannes Berg authored and Wey-Yi Guy committed Nov 16, 2010
1 parent a833da9 commit 47bebde
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 76f379cec6df6c9c5c9dbf7377d1bbbb0bf3fd5f
refs/heads/master: 8d56396ac3926412dd97dcb9dd8d0cef556b908e
3 changes: 1 addition & 2 deletions trunk/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
Original file line number Diff line number Diff line change
Expand Up @@ -518,7 +518,7 @@ int iwlagn_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
struct iwl_cmd_meta *out_meta;
struct iwl_tx_cmd *tx_cmd;
struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS];
int swq_id, txq_id;
int txq_id;
dma_addr_t phys_addr;
dma_addr_t txcmd_phys;
dma_addr_t scratch_phys;
Expand Down Expand Up @@ -620,7 +620,6 @@ int iwlagn_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
}

txq = &priv->txq[txq_id];
swq_id = txq->swq_id;
q = &txq->q;

if (unlikely(iwl_queue_space(q) < q->high_mark)) {
Expand Down

0 comments on commit 47bebde

Please sign in to comment.