aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/rt2x00/rt2500usb.c
diff options
context:
space:
mode:
authorIvo van Doorn <ivdoorn@gmail.com>2008-03-15 16:38:07 -0400
committerJohn W. Linville <linville@tuxdriver.com>2008-03-25 16:41:58 -0400
commit19d30e02998ef1eb9f82a7d3ce9b4a97dba5aa13 (patch)
tree66972ff817b2d6b8641a04d4f6e122e8fdc710ba /drivers/net/wireless/rt2x00/rt2500usb.c
parente2839d8f509451acf6b1f22787f25ce98383d94c (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/rt2500usb.c')
-rw-r--r--drivers/net/wireless/rt2x00/rt2500usb.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2500usb.c b/drivers/net/wireless/rt2x00/rt2500usb.c
index c8216d755835..8959a684f40b 100644
--- a/drivers/net/wireless/rt2x00/rt2500usb.c
+++ b/drivers/net/wireless/rt2x00/rt2500usb.c
@@ -1139,13 +1139,16 @@ static void rt2500usb_fill_rxdone(struct queue_entry *entry,
1139 * the signal is the PLCP value. If it was received with 1139 * the signal is the PLCP value. If it was received with
1140 * a CCK bitrate the signal is the rate in 100kbit/s. 1140 * a CCK bitrate the signal is the rate in 100kbit/s.
1141 */ 1141 */
1142 rxdesc->ofdm = rt2x00_get_field32(word0, RXD_W0_OFDM);
1143 rxdesc->signal = rt2x00_get_field32(word1, RXD_W1_SIGNAL); 1142 rxdesc->signal = rt2x00_get_field32(word1, RXD_W1_SIGNAL);
1144 rxdesc->signal_plcp = rxdesc->ofdm;
1145 rxdesc->rssi = rt2x00_get_field32(word1, RXD_W1_RSSI) - 1143 rxdesc->rssi = rt2x00_get_field32(word1, RXD_W1_RSSI) -
1146 entry->queue->rt2x00dev->rssi_offset; 1144 entry->queue->rt2x00dev->rssi_offset;
1147 rxdesc->size = rt2x00_get_field32(word0, RXD_W0_DATABYTE_COUNT); 1145 rxdesc->size = rt2x00_get_field32(word0, RXD_W0_DATABYTE_COUNT);
1148 rxdesc->my_bss = !!rt2x00_get_field32(word0, RXD_W0_MY_BSS); 1146
1147 rxdesc->dev_flags = 0;
1148 if (rt2x00_get_field32(word0, RXD_W0_OFDM))
1149 rxdesc->dev_flags |= RXDONE_SIGNAL_PLCP;
1150 if (rt2x00_get_field32(word0, RXD_W0_MY_BSS))
1151 rxdesc->dev_flags |= RXDONE_MY_BSS;
1149 1152
1150 /* 1153 /*
1151 * Adjust the skb memory window to the frame boundaries. 1154 * Adjust the skb memory window to the frame boundaries.