diff options
author | Ivo van Doorn <ivdoorn@gmail.com> | 2008-03-15 16:38:07 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-03-25 16:41:58 -0400 |
commit | 19d30e02998ef1eb9f82a7d3ce9b4a97dba5aa13 (patch) | |
tree | 66972ff817b2d6b8641a04d4f6e122e8fdc710ba /drivers/net/wireless/rt2x00/rt2500pci.c | |
parent | e2839d8f509451acf6b1f22787f25ce98383d94c (diff) |
rt2x00: Add dev_flags to rx descriptor
The rxdone_entry_desc structure contains 3 fields
which are always 1 or 0. We can safe 8 bytes by
replacing them with a single dev_flags fields which
contain the flags for those settings.
Additionally we can remove the OFDM flag since it
is no longer used since the introduction of the
SIGNAL_PLCP flag.
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2500pci.c')
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2500pci.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2500pci.c b/drivers/net/wireless/rt2x00/rt2500pci.c index 0f5139a2f238..9468dde3c95e 100644 --- a/drivers/net/wireless/rt2x00/rt2500pci.c +++ b/drivers/net/wireless/rt2x00/rt2500pci.c | |||
@@ -1225,13 +1225,16 @@ static void rt2500pci_fill_rxdone(struct queue_entry *entry, | |||
1225 | * the signal is the PLCP value. If it was received with | 1225 | * the signal is the PLCP value. If it was received with |
1226 | * a CCK bitrate the signal is the rate in 100kbit/s. | 1226 | * a CCK bitrate the signal is the rate in 100kbit/s. |
1227 | */ | 1227 | */ |
1228 | rxdesc->ofdm = rt2x00_get_field32(word0, RXD_W0_OFDM); | ||
1229 | rxdesc->signal = rt2x00_get_field32(word2, RXD_W2_SIGNAL); | 1228 | rxdesc->signal = rt2x00_get_field32(word2, RXD_W2_SIGNAL); |
1230 | rxdesc->signal_plcp = rxdesc->ofdm; | ||
1231 | rxdesc->rssi = rt2x00_get_field32(word2, RXD_W2_RSSI) - | 1229 | rxdesc->rssi = rt2x00_get_field32(word2, RXD_W2_RSSI) - |
1232 | entry->queue->rt2x00dev->rssi_offset; | 1230 | entry->queue->rt2x00dev->rssi_offset; |
1233 | rxdesc->size = rt2x00_get_field32(word0, RXD_W0_DATABYTE_COUNT); | 1231 | rxdesc->size = rt2x00_get_field32(word0, RXD_W0_DATABYTE_COUNT); |
1234 | rxdesc->my_bss = !!rt2x00_get_field32(word0, RXD_W0_MY_BSS); | 1232 | |
1233 | rxdesc->dev_flags = 0; | ||
1234 | if (rt2x00_get_field32(word0, RXD_W0_OFDM)) | ||
1235 | rxdesc->dev_flags |= RXDONE_SIGNAL_PLCP; | ||
1236 | if (rt2x00_get_field32(word0, RXD_W0_MY_BSS)) | ||
1237 | rxdesc->dev_flags |= RXDONE_MY_BSS; | ||
1235 | } | 1238 | } |
1236 | 1239 | ||
1237 | /* | 1240 | /* |