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

Commit 7e56d38d authored by Ivo van Doorn's avatar Ivo van Doorn Committed by David S. Miller
Browse files

rt2x00: Determine MY_BSS from descriptor 



Use the MY_BSS descriptor field to determine if the
received frame belongs to the same BSS as the interface.
This can be used by rxdone to determine if the frame
should be updated or not.

Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent dd3193e1

drivers/net/wireless/rt2x00/rt2400pci.c

+1 −0
Original line number Diff line number Diff line
@@ -1117,6 +1117,7 @@ static void rt2400pci_fill_rxdone(struct data_entry *entry, 
	    entry->ring->rt2x00dev->rssi_offset;

	desc->ofdm = 0;

	desc->size = rt2x00_get_field32(word0, RXD_W0_DATABYTE_COUNT);

	desc->my_bss = !!rt2x00_get_field32(word0, RXD_W0_MY_BSS);

}



/*

drivers/net/wireless/rt2x00/rt2500pci.c

+1 −0
Original line number Diff line number Diff line
@@ -1264,6 +1264,7 @@ static void rt2500pci_fill_rxdone(struct data_entry *entry, 
	    entry->ring->rt2x00dev->rssi_offset;

	desc->ofdm = rt2x00_get_field32(word0, RXD_W0_OFDM);

	desc->size = rt2x00_get_field32(word0, RXD_W0_DATABYTE_COUNT);

	desc->my_bss = !!rt2x00_get_field32(word0, RXD_W0_MY_BSS);

}



/*

drivers/net/wireless/rt2x00/rt2500usb.c

+1 −2
Original line number Diff line number Diff line
@@ -1138,8 +1138,7 @@ static void rt2500usb_fill_rxdone(struct data_entry *entry, 
	    entry->ring->rt2x00dev->rssi_offset;

	desc->ofdm = rt2x00_get_field32(word0, RXD_W0_OFDM);

	desc->size = rt2x00_get_field32(word0, RXD_W0_DATABYTE_COUNT);



	return;

	desc->my_bss = !!rt2x00_get_field32(word0, RXD_W0_MY_BSS);

}



/*

drivers/net/wireless/rt2x00/rt2x00dev.c

+5 −13
Original line number Diff line number Diff line
@@ -526,7 +526,6 @@ void rt2x00lib_rxdone(struct data_entry *entry, struct sk_buff *skb, 
		      struct rxdata_entry_desc *desc)

{

	struct rt2x00_dev *rt2x00dev = entry->ring->rt2x00dev;

	struct interface *intf = &rt2x00dev->interface;

	struct ieee80211_rx_status *rx_status = &rt2x00dev->rx_status;

	struct ieee80211_hw_mode *mode;

	struct ieee80211_rate *rate;
@@ -559,19 +558,12 @@ void rt2x00lib_rxdone(struct data_entry *entry, struct sk_buff *skb, 
	}



	/*

	 * Only update link status if this is a beacon frame carrying our

	 * bssid.

	 * Only update link status if this is a beacon frame carrying our bssid.

	 */

	hdr = (struct ieee80211_hdr*)skb->data;

	if (skb->len >= sizeof(struct ieee80211_hdr *)) {

	fc = le16_to_cpu(hdr->frame_control);

		if ((intf->type == IEEE80211_IF_TYPE_STA

		     || intf->type == IEEE80211_IF_TYPE_IBSS)

		    && is_beacon(fc)

		    && compare_ether_addr(hdr->addr3, intf->bssid) == 0)

			rt2x00lib_update_link_stats(&rt2x00dev->link,

						    desc->rssi);

	}

	if (is_beacon(fc) && desc->my_bss)

		rt2x00lib_update_link_stats(&rt2x00dev->link, desc->rssi);



	rt2x00dev->link.qual.rx_success++;

drivers/net/wireless/rt2x00/rt2x00ring.h

+1 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ struct rxdata_entry_desc { 
	int ofdm;

	int size;

	int flags;

	int my_bss;

};



/*