diff options
| author | Patrick McHardy <kaber@trash.net> | 2010-05-10 12:39:28 -0400 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2010-05-10 12:39:28 -0400 |
| commit | 1e4b1057121bc756b91758a434b504d2010f6088 (patch) | |
| tree | b016cf2c728289c7e36d9e4e488f30ab0bd0ae6e /drivers/net/wireless/p54/txrx.c | |
| parent | 3b254c54ec46eb022cb26ee6ab37fae23f5f7d6a (diff) | |
| parent | 3ee943728fff536edaf8f59faa58aaa1aa7366e3 (diff) | |
Merge branch 'master' of /repos/git/net-next-2.6
Conflicts:
net/bridge/br_device.c
net/bridge/br_forward.c
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'drivers/net/wireless/p54/txrx.c')
| -rw-r--r-- | drivers/net/wireless/p54/txrx.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/p54/txrx.c b/drivers/net/wireless/p54/txrx.c index 2ceff5480355..4e6891099d43 100644 --- a/drivers/net/wireless/p54/txrx.c +++ b/drivers/net/wireless/p54/txrx.c | |||
| @@ -350,7 +350,6 @@ static int p54_rx_data(struct p54_common *priv, struct sk_buff *skb) | |||
| 350 | rx_status->flag |= RX_FLAG_MMIC_ERROR; | 350 | rx_status->flag |= RX_FLAG_MMIC_ERROR; |
| 351 | 351 | ||
| 352 | rx_status->signal = p54_rssi_to_dbm(priv, hdr->rssi); | 352 | rx_status->signal = p54_rssi_to_dbm(priv, hdr->rssi); |
| 353 | rx_status->noise = priv->noise; | ||
| 354 | if (hdr->rate & 0x10) | 353 | if (hdr->rate & 0x10) |
| 355 | rx_status->flag |= RX_FLAG_SHORTPRE; | 354 | rx_status->flag |= RX_FLAG_SHORTPRE; |
| 356 | if (priv->hw->conf.channel->band == IEEE80211_BAND_5GHZ) | 355 | if (priv->hw->conf.channel->band == IEEE80211_BAND_5GHZ) |