diff options
| author | David S. Miller <davem@davemloft.net> | 2012-04-12 20:12:31 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-04-12 20:12:31 -0400 |
| commit | 816a7854d56f19aeba3c83e1ed8c2c0ef275365a (patch) | |
| tree | c3b82ad98006fc5fa7b408c142e75a6053195dfa /drivers/net/wireless/p54/txrx.c | |
| parent | 011e3c63251be832d23df9f0697626ab7b354d02 (diff) | |
| parent | 7eab0f64a9eba5405222fdef0ede2468bf495efd (diff) | |
| download | op-kernel-dev-816a7854d56f19aeba3c83e1ed8c2c0ef275365a.zip op-kernel-dev-816a7854d56f19aeba3c83e1ed8c2c0ef275365a.tar.gz | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next
Diffstat (limited to 'drivers/net/wireless/p54/txrx.c')
| -rw-r--r-- | drivers/net/wireless/p54/txrx.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/p54/txrx.c b/drivers/net/wireless/p54/txrx.c index a08a6f0..7c8f118 100644 --- a/drivers/net/wireless/p54/txrx.c +++ b/drivers/net/wireless/p54/txrx.c @@ -914,8 +914,7 @@ void p54_tx_80211(struct ieee80211_hw *dev, struct sk_buff *skb) txhdr->hw_queue = queue; txhdr->backlog = priv->tx_stats[queue].len - 1; memset(txhdr->durations, 0, sizeof(txhdr->durations)); - txhdr->tx_antenna = ((info->antenna_sel_tx == 0) ? - 2 : info->antenna_sel_tx - 1) & priv->tx_diversity_mask; + txhdr->tx_antenna = 2 & priv->tx_diversity_mask; if (priv->rxhw == 5) { txhdr->longbow.cts_rate = cts_rate; txhdr->longbow.output_power = cpu_to_le16(priv->output_power); |
