redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

rt2x00: Determine MY_BSS from descriptor

Browse source 
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: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Ivo van Doorn 2008-01-06 23:41:28 +01:00 committed by David S. Miller
parent dd3193e1c2
commit 7e56d38d5d
7 changed files with 11 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/net/wireless/rt2x00/rt2400pci.c
View file

@ -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);
}
/*

1
drivers/net/wireless/rt2x00/rt2500pci.c
View file

@ -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);
}
/*

3
drivers/net/wireless/rt2x00/rt2500usb.c
View file

@ -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);
}
/*

18
drivers/net/wireless/rt2x00/rt2x00dev.c
View file

@ -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);
}
hdr = (struct ieee80211_hdr*)skb->data;
fc = le16_to_cpu(hdr->frame_control);
if (is_beacon(fc) && desc->my_bss)
rt2x00lib_update_link_stats(&rt2x00dev->link, desc->rssi);
rt2x00dev->link.qual.rx_success++;

1
drivers/net/wireless/rt2x00/rt2x00ring.h
View file

@ -59,6 +59,7 @@ struct rxdata_entry_desc {
int ofdm;
int size;
int flags;
int my_bss;
};
/*

3
drivers/net/wireless/rt2x00/rt61pci.c
View file

@ -1695,8 +1695,7 @@ static void rt61pci_fill_rxdone(struct data_entry *entry,
desc->rssi = rt61pci_agc_to_rssi(entry->ring->rt2x00dev, word1);
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);
}
/*

3
drivers/net/wireless/rt2x00/rt73usb.c
View file

@ -1396,13 +1396,12 @@ static void rt73usb_fill_rxdone(struct data_entry *entry,
desc->rssi = rt73usb_agc_to_rssi(entry->ring->rt2x00dev, word1);
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);
/*
* Pull the skb to clear the descriptor area.
*/
skb_pull(entry->skb, entry->ring->desc_size);
return;
}
/*