diff --git a/[refs] b/[refs] index a5dd75f9bba4..a8ef92aa9681 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f0e62e46c3cace185eed10ebf53ef060ba6d7bb1 +refs/heads/master: 8ed09854073ae0a19556d4d93cf79cf368c23673 diff --git a/trunk/drivers/net/wireless/rt2x00/rt2400pci.c b/trunk/drivers/net/wireless/rt2x00/rt2400pci.c index 4cd284209d16..1f49561d3ddc 100644 --- a/trunk/drivers/net/wireless/rt2x00/rt2400pci.c +++ b/trunk/drivers/net/wireless/rt2x00/rt2400pci.c @@ -1072,9 +1072,10 @@ static void rt2400pci_fill_rxdone(struct queue_entry *entry, /* * Obtain the status about this packet. - * The signal is the PLCP value. + * The signal is the PLCP value, and needs to be stripped + * of the preamble bit (0x08). */ - rxdesc->signal = rt2x00_get_field32(word2, RXD_W2_SIGNAL); + rxdesc->signal = rt2x00_get_field32(word2, RXD_W2_SIGNAL) & ~0x08; rxdesc->signal_plcp = 1; rxdesc->rssi = rt2x00_get_field32(word2, RXD_W3_RSSI) - entry->queue->rt2x00dev->rssi_offset; diff --git a/trunk/drivers/net/wireless/rt2x00/rt2x00dev.c b/trunk/drivers/net/wireless/rt2x00/rt2x00dev.c index a885254d2e85..b81efc9b058d 100644 --- a/trunk/drivers/net/wireless/rt2x00/rt2x00dev.c +++ b/trunk/drivers/net/wireless/rt2x00/rt2x00dev.c @@ -573,13 +573,6 @@ void rt2x00lib_rxdone(struct queue_entry *entry, int idx = -1; u16 fc; - /* - * If the signal is the plcp value, - * we need to strip the preamble bit (0x08). - */ - if (rxdesc->signal_plcp) - rxdesc->signal &= ~0x08; - /* * Update RX statistics. */