Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c6aa3c0 authored by Ivo van Doorn's avatar Ivo van Doorn Committed by John W. Linville
Browse files

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: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 2af0a570

drivers/net/wireless/rt2x00/rt2500pci.c

+2 −0
Original line number Diff line number Diff line
@@ -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;

}

drivers/net/wireless/rt2x00/rt2500usb.c

+2 −0
Original line number Diff line number Diff line
@@ -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;

drivers/net/wireless/rt2x00/rt2x00dev.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/net/wireless/rt2x00/rt2x00queue.h

+4 −3
Original line number Diff line number Diff line
@@ -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,

};



/**

drivers/net/wireless/rt2x00/rt61pci.c

+2 −0
Original line number Diff line number Diff line
@@ -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;

}