rt2x00: FIF_PSPOLL filter flag support
RFC PATCH 1/1 rt2x00: FIF_PSPOLL filter flag support
This patch implements FIF_PSPOLL filter flag support in rt2x00 drivers, which has been introduced in mac80211 (see
http://marc.info/?l=linux-wireless&m=124897986330807&w=2).
Signed-off-by Igor Perminov <[email protected]>
--- drivers/net/wireless/rt2x00/rt2800usb.c | 9 ++++++++- drivers/net/wireless/rt2x00/rt2x00.h | 6 ++++++ drivers/net/wireless/rt2x00/rt2x00mac.c | 17 +++++++++++++++++ drivers/net/wireless/rt2x00/rt61pci.c | 8 +++++++- drivers/net/wireless/rt2x00/rt73usb.c | 8 +++++++- 5 files changed, 45 insertions(+), 3 deletions(-)
drivers/net/wireless/rt2x00/rt2800usb.c +8 -1
@@ -518,7 +518,7 @@ static void rt2800usb_config_filter(struct rt2x00_dev *rt2x00dev,rt2x00_set_field32 (®,RX_FILTER_CFG_DROP_RTS , !(filter_flags &FIF_CONTROL ));rt2x00_set_field32 (®,RX_FILTER_CFG_DROP_PSPOLL , - !(filter_flags &FIF_CONTROL )); + !(filter_flags &FIF_PSPOLL ));rt2x00_set_field32 (®,RX_FILTER_CFG_DROP_BA ,1 );rt2x00_set_field32 (®,RX_FILTER_CFG_DROP_BAR ,0 ); rt2x00_set_field32(®, RX_FILTER_CFG_DROP_CNTL,
@@ -2624,6 +2624,13 @@ static int rt2800usb_probe_hw(struct rt2x00_dev *rt2x00dev)return retval;/* +* This device has multiple filters for control frames +* and has a separate filter for PS Poll frames. +*/ +__set_bit (DRIVER_HAS_MULTIPLE_CONTROL_FILTER , &rt2x00dev->flags); +__set_bit (DRIVER_HAS_PSPOLL_FILTER , &rt2x00dev->flags); + +/* * This device requires firmware. */ __set_bit (DRIVER_REQUIRE_FIRMWARE , &rt2x00dev->flags);
drivers/net/wireless/rt2x00/rt2x00.h +6 -0
@@ -607,6 +607,12 @@ enum rt2x00_flags {DRIVER_REQUIRE_L2PAD ,/* +* Driver capabilities +*/ +DRIVER_HAS_MULTIPLE_CONTROL_FILTER , +DRIVER_HAS_PSPOLL_FILTER , + +/* * Driver features */ CONFIG_SUPPORT_HW_BUTTON,
drivers/net/wireless/rt2x00/rt2x00mac.c +17 -0
@@ -407,6 +407,7 @@ void rt2x00mac_configure_filter(struct ieee80211_hw *hw,FIF_FCSFAIL |FIF_PLCPFAIL |FIF_CONTROL | +FIF_PSPOLL |FIF_OTHER_BSS |FIF_PROMISC_IN_BSS ;
@@ -422,6 +423,22 @@ void rt2x00mac_configure_filter(struct ieee80211_hw *hw, *total_flags |=FIF_PROMISC_IN_BSS |FIF_OTHER_BSS ;/* +* If the device has a single filter for all control frames, +* FIF_CONTROL and FIF_PSPOLL flags imply each other. +* And if the device has more than one filter for control frames +* of different types, but has no a separate filter for PS Poll frames, +* FIF_CONTROL flag implies FIF_PSPOLL. +*/ +if (!test_bit (DRIVER_HAS_MULTIPLE_CONTROL_FILTER , &rt2x00dev->flags)) { +if (*total_flags &FIF_CONTROL || + *total_flags &FIF_PSPOLL ) + *total_flags |=FIF_CONTROL |FIF_PSPOLL ; + }else if (!test_bit (DRIVER_HAS_PSPOLL_FILTER , &rt2x00dev->flags)) { +if (*total_flags &FIF_CONTROL ) + *total_flags |=FIF_PSPOLL ; + } + +/* * Check if there is any work left for us. */ if (rt2x00dev->packet_filter == *total_flags)
drivers/net/wireless/rt2x00/rt61pci.c +7 -1
@@ -530,7 +530,7 @@ static void rt61pci_config_filter(struct rt2x00_dev *rt2x00dev,rt2x00_set_field32 (®,TXRX_CSR0_DROP_PHYSICAL , !(filter_flags &FIF_PLCPFAIL ));rt2x00_set_field32 (®,TXRX_CSR0_DROP_CONTROL , - !(filter_flags &FIF_CONTROL )); + !(filter_flags & (FIF_CONTROL |FIF_PSPOLL )));rt2x00_set_field32 (®,TXRX_CSR0_DROP_NOT_TO_ME , !(filter_flags &FIF_PROMISC_IN_BSS )); rt2x00_set_field32(®, TXRX_CSR0_DROP_TO_DS,
@@ -2619,6 +2619,12 @@ static int rt61pci_probe_hw(struct rt2x00_dev *rt2x00dev)return retval;/* +* This device has multiple filters for control frames, +* but has no a separate filter for PS Poll frames. +*/ +__set_bit (DRIVER_HAS_MULTIPLE_CONTROL_FILTER , &rt2x00dev->flags); + +/* * This device requires firmware and DMA mapped skbs. */ __set_bit (DRIVER_REQUIRE_FIRMWARE , &rt2x00dev->flags);
drivers/net/wireless/rt2x00/rt73usb.c +7 -1
@@ -493,7 +493,7 @@ static void rt73usb_config_filter(struct rt2x00_dev *rt2x00dev,rt2x00_set_field32 (®,TXRX_CSR0_DROP_PHYSICAL , !(filter_flags &FIF_PLCPFAIL ));rt2x00_set_field32 (®,TXRX_CSR0_DROP_CONTROL , - !(filter_flags &FIF_CONTROL )); + !(filter_flags & (FIF_CONTROL |FIF_PSPOLL )));rt2x00_set_field32 (®,TXRX_CSR0_DROP_NOT_TO_ME , !(filter_flags &FIF_PROMISC_IN_BSS )); rt2x00_set_field32(®, TXRX_CSR0_DROP_TO_DS,
@@ -2144,6 +2144,12 @@ static int rt73usb_probe_hw(struct rt2x00_dev *rt2x00dev)return retval;/* +* This device has multiple filters for control frames, +* but has no a separate filter for PS Poll frames. +*/ +__set_bit (DRIVER_HAS_MULTIPLE_CONTROL_FILTER , &rt2x00dev->flags); + +/* * This device requires firmware. */ __set_bit (DRIVER_REQUIRE_FIRMWARE , &rt2x00dev->flags);
Quoted 3 lines · Igor Perminov
This patch implements
FIF_PSPOLLfilter flag support in rt2x00 drivers, which has been introduced in mac80211 (see
http://marc.info/?l=linux-wireless&m=124897986330807&w=2).
This patch implements support of FIF_PSPOLL for all drivers in drivers/net/wireless/rt2x00 directory. Including rt2400pci, rt2500pci and rt2500usb, which are not modified at all.
I've tested the patch with rt73usb and rt2500usb sticks only. Unfortunately, I have no other kinds of Ralink hardware.
Igor