mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 05:48:40 +00:00
rt2x00: TO_DS filter depends on intf_ap_count
The TO_DS filter does not only depend on the FIF_PROMISC_IN_BSS flag provided by mac80211, but also on the intf_ap_count count. This makes sense, since when Master mode is active, we should all frames that are send to the active AP (the device itself). This means that when an interface is added we should force the packet filter to be updated during the next mac80211 call of configure_filter() to make sure the intf_ap_count field is checked. Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
bc5213f468
commit
e0b005fa14
6 changed files with 17 additions and 5 deletions
|
@ -290,7 +290,8 @@ static void rt2400pci_config_filter(struct rt2x00_dev *rt2x00dev,
|
|||
rt2x00_set_field32(®, RXCSR0_DROP_NOT_TO_ME,
|
||||
!(filter_flags & FIF_PROMISC_IN_BSS));
|
||||
rt2x00_set_field32(®, RXCSR0_DROP_TODS,
|
||||
!(filter_flags & FIF_PROMISC_IN_BSS));
|
||||
!(filter_flags & FIF_PROMISC_IN_BSS) &&
|
||||
!rt2x00dev->intf_ap_count);
|
||||
rt2x00_set_field32(®, RXCSR0_DROP_VERSION_ERROR, 1);
|
||||
rt2x00pci_register_write(rt2x00dev, RXCSR0, reg);
|
||||
}
|
||||
|
|
|
@ -291,7 +291,8 @@ static void rt2500pci_config_filter(struct rt2x00_dev *rt2x00dev,
|
|||
rt2x00_set_field32(®, RXCSR0_DROP_NOT_TO_ME,
|
||||
!(filter_flags & FIF_PROMISC_IN_BSS));
|
||||
rt2x00_set_field32(®, RXCSR0_DROP_TODS,
|
||||
!(filter_flags & FIF_PROMISC_IN_BSS));
|
||||
!(filter_flags & FIF_PROMISC_IN_BSS) &&
|
||||
!rt2x00dev->intf_ap_count);
|
||||
rt2x00_set_field32(®, RXCSR0_DROP_VERSION_ERROR, 1);
|
||||
rt2x00_set_field32(®, RXCSR0_DROP_MCAST,
|
||||
!(filter_flags & FIF_ALLMULTI));
|
||||
|
|
|
@ -337,7 +337,8 @@ static void rt2500usb_config_filter(struct rt2x00_dev *rt2x00dev,
|
|||
rt2x00_set_field16(®, TXRX_CSR2_DROP_NOT_TO_ME,
|
||||
!(filter_flags & FIF_PROMISC_IN_BSS));
|
||||
rt2x00_set_field16(®, TXRX_CSR2_DROP_TODS,
|
||||
!(filter_flags & FIF_PROMISC_IN_BSS));
|
||||
!(filter_flags & FIF_PROMISC_IN_BSS) &&
|
||||
!rt2x00dev->intf_ap_count);
|
||||
rt2x00_set_field16(®, TXRX_CSR2_DROP_VERSION_ERROR, 1);
|
||||
rt2x00_set_field16(®, TXRX_CSR2_DROP_MULTICAST,
|
||||
!(filter_flags & FIF_ALLMULTI));
|
||||
|
|
|
@ -253,6 +253,13 @@ int rt2x00mac_add_interface(struct ieee80211_hw *hw,
|
|||
*/
|
||||
rt2x00lib_config_intf(rt2x00dev, intf, conf->type, intf->mac, NULL);
|
||||
|
||||
/*
|
||||
* Some filters depend on the current working mode. We can force
|
||||
* an update during the next configure_filter() run by mac80211 by
|
||||
* resetting the current packet_filter state.
|
||||
*/
|
||||
rt2x00dev->packet_filter = 0;
|
||||
|
||||
return 0;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(rt2x00mac_add_interface);
|
||||
|
|
|
@ -342,7 +342,8 @@ static void rt61pci_config_filter(struct rt2x00_dev *rt2x00dev,
|
|||
rt2x00_set_field32(®, TXRX_CSR0_DROP_NOT_TO_ME,
|
||||
!(filter_flags & FIF_PROMISC_IN_BSS));
|
||||
rt2x00_set_field32(®, TXRX_CSR0_DROP_TO_DS,
|
||||
!(filter_flags & FIF_PROMISC_IN_BSS));
|
||||
!(filter_flags & FIF_PROMISC_IN_BSS) &&
|
||||
!rt2x00dev->intf_ap_count);
|
||||
rt2x00_set_field32(®, TXRX_CSR0_DROP_VERSION_ERROR, 1);
|
||||
rt2x00_set_field32(®, TXRX_CSR0_DROP_MULTICAST,
|
||||
!(filter_flags & FIF_ALLMULTI));
|
||||
|
|
|
@ -354,7 +354,8 @@ static void rt73usb_config_filter(struct rt2x00_dev *rt2x00dev,
|
|||
rt2x00_set_field32(®, TXRX_CSR0_DROP_NOT_TO_ME,
|
||||
!(filter_flags & FIF_PROMISC_IN_BSS));
|
||||
rt2x00_set_field32(®, TXRX_CSR0_DROP_TO_DS,
|
||||
!(filter_flags & FIF_PROMISC_IN_BSS));
|
||||
!(filter_flags & FIF_PROMISC_IN_BSS) &&
|
||||
!rt2x00dev->intf_ap_count);
|
||||
rt2x00_set_field32(®, TXRX_CSR0_DROP_VERSION_ERROR, 1);
|
||||
rt2x00_set_field32(®, TXRX_CSR0_DROP_MULTICAST,
|
||||
!(filter_flags & FIF_ALLMULTI));
|
||||
|
|
Loading…
Reference in a new issue