rt2x00: Add Signal type flag
Instead of using the PLCP flag to indicate if the signal value is plcp or the bitrate we should add a new flag to mark the bitrate type explicitely. This is usefull when new types are added later for rt2800. Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
2af0a570b4
commit
6c6aa3c004
|
@ -1316,6 +1316,8 @@ static void rt2500pci_fill_rxdone(struct queue_entry *entry,
|
|||
|
||||
if (rt2x00_get_field32(word0, RXD_W0_OFDM))
|
||||
rxdesc->dev_flags |= RXDONE_SIGNAL_PLCP;
|
||||
else
|
||||
rxdesc->dev_flags |= RXDONE_SIGNAL_BITRATE;
|
||||
if (rt2x00_get_field32(word0, RXD_W0_MY_BSS))
|
||||
rxdesc->dev_flags |= RXDONE_MY_BSS;
|
||||
}
|
||||
|
|
|
@ -1280,6 +1280,8 @@ static void rt2500usb_fill_rxdone(struct queue_entry *entry,
|
|||
|
||||
if (rt2x00_get_field32(word0, RXD_W0_OFDM))
|
||||
rxdesc->dev_flags |= RXDONE_SIGNAL_PLCP;
|
||||
else
|
||||
rxdesc->dev_flags |= RXDONE_SIGNAL_BITRATE;
|
||||
if (rt2x00_get_field32(word0, RXD_W0_MY_BSS))
|
||||
rxdesc->dev_flags |= RXDONE_MY_BSS;
|
||||
|
||||
|
|
|
@ -653,7 +653,7 @@ void rt2x00lib_rxdone(struct rt2x00_dev *rt2x00dev,
|
|||
|
||||
if (((rxdesc.dev_flags & RXDONE_SIGNAL_PLCP) &&
|
||||
(rate->plcp == rxdesc.signal)) ||
|
||||
(!(rxdesc.dev_flags & RXDONE_SIGNAL_PLCP) &&
|
||||
((rxdesc.dev_flags & RXDONE_SIGNAL_BITRATE) &&
|
||||
(rate->bitrate == rxdesc.signal))) {
|
||||
idx = i;
|
||||
break;
|
||||
|
|
|
@ -140,13 +140,14 @@ static inline struct skb_frame_desc* get_skb_frame_desc(struct sk_buff *skb)
|
|||
/**
|
||||
* enum rxdone_entry_desc_flags: Flags for &struct rxdone_entry_desc
|
||||
*
|
||||
* @RXDONE_SIGNAL_PLCP: Does the signal field contain the plcp value,
|
||||
* or does it contain the bitrate itself.
|
||||
* @RXDONE_SIGNAL_PLCP: Signal field contains the plcp value.
|
||||
* @RXDONE_SIGNAL_BITRATE: Signal field contains the bitrate value.
|
||||
* @RXDONE_MY_BSS: Does this frame originate from device's BSS.
|
||||
*/
|
||||
enum rxdone_entry_desc_flags {
|
||||
RXDONE_SIGNAL_PLCP = 1 << 0,
|
||||
RXDONE_MY_BSS = 1 << 1,
|
||||
RXDONE_SIGNAL_BITRATE = 1 << 1,
|
||||
RXDONE_MY_BSS = 1 << 2,
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
|
@ -1991,6 +1991,8 @@ static void rt61pci_fill_rxdone(struct queue_entry *entry,
|
|||
|
||||
if (rt2x00_get_field32(word0, RXD_W0_OFDM))
|
||||
rxdesc->dev_flags |= RXDONE_SIGNAL_PLCP;
|
||||
else
|
||||
rxdesc->dev_flags |= RXDONE_SIGNAL_BITRATE;
|
||||
if (rt2x00_get_field32(word0, RXD_W0_MY_BSS))
|
||||
rxdesc->dev_flags |= RXDONE_MY_BSS;
|
||||
}
|
||||
|
|
|
@ -1766,6 +1766,8 @@ static void rt73usb_fill_rxdone(struct queue_entry *entry,
|
|||
|
||||
if (rt2x00_get_field32(word0, RXD_W0_OFDM))
|
||||
rxdesc->dev_flags |= RXDONE_SIGNAL_PLCP;
|
||||
else
|
||||
rxdesc->dev_flags |= RXDONE_SIGNAL_BITRATE;
|
||||
if (rt2x00_get_field32(word0, RXD_W0_MY_BSS))
|
||||
rxdesc->dev_flags |= RXDONE_MY_BSS;
|
||||
|
||||
|
|
Loading…
Reference in a new issue