forked from Minki/linux
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 <igor.perminov@inbox.ru> Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
17512dc3b7
commit
1afcfd54fd
@ -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,
|
||||
@ -2623,6 +2623,13 @@ static int rt2800usb_probe_hw(struct rt2x00_dev *rt2x00dev)
|
||||
if (retval)
|
||||
return retval;
|
||||
|
||||
/*
|
||||
* This device has multiple filters for control frames
|
||||
* and has a separate filter for PS Poll frames.
|
||||
*/
|
||||
__set_bit(DRIVER_SUPPORT_CONTROL_FILTERS, &rt2x00dev->flags);
|
||||
__set_bit(DRIVER_SUPPORT_CONTROL_FILTER_PSPOLL, &rt2x00dev->flags);
|
||||
|
||||
/*
|
||||
* This device requires firmware.
|
||||
*/
|
||||
|
@ -624,6 +624,8 @@ enum rt2x00_flags {
|
||||
*/
|
||||
CONFIG_SUPPORT_HW_BUTTON,
|
||||
CONFIG_SUPPORT_HW_CRYPTO,
|
||||
DRIVER_SUPPORT_CONTROL_FILTERS,
|
||||
DRIVER_SUPPORT_CONTROL_FILTER_PSPOLL,
|
||||
|
||||
/*
|
||||
* Driver configuration
|
||||
|
@ -392,6 +392,7 @@ void rt2x00mac_configure_filter(struct ieee80211_hw *hw,
|
||||
FIF_FCSFAIL |
|
||||
FIF_PLCPFAIL |
|
||||
FIF_CONTROL |
|
||||
FIF_PSPOLL |
|
||||
FIF_OTHER_BSS |
|
||||
FIF_PROMISC_IN_BSS;
|
||||
|
||||
@ -406,6 +407,22 @@ void rt2x00mac_configure_filter(struct ieee80211_hw *hw,
|
||||
*total_flags & FIF_PROMISC_IN_BSS)
|
||||
*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_SUPPORT_CONTROL_FILTERS, &rt2x00dev->flags)) {
|
||||
if (*total_flags & FIF_CONTROL || *total_flags & FIF_PSPOLL)
|
||||
*total_flags |= FIF_CONTROL | FIF_PSPOLL;
|
||||
}
|
||||
if (!test_bit(DRIVER_SUPPORT_CONTROL_FILTER_PSPOLL, &rt2x00dev->flags)) {
|
||||
if (*total_flags & FIF_CONTROL)
|
||||
*total_flags |= FIF_PSPOLL;
|
||||
}
|
||||
|
||||
/*
|
||||
* Check if there is any work left for us.
|
||||
*/
|
||||
|
@ -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,
|
||||
@ -2623,6 +2623,12 @@ static int rt61pci_probe_hw(struct rt2x00_dev *rt2x00dev)
|
||||
if (retval)
|
||||
return retval;
|
||||
|
||||
/*
|
||||
* This device has multiple filters for control frames,
|
||||
* but has no a separate filter for PS Poll frames.
|
||||
*/
|
||||
__set_bit(DRIVER_SUPPORT_CONTROL_FILTERS, &rt2x00dev->flags);
|
||||
|
||||
/*
|
||||
* This device requires firmware and DMA mapped skbs.
|
||||
*/
|
||||
|
@ -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,
|
||||
@ -2143,6 +2143,12 @@ static int rt73usb_probe_hw(struct rt2x00_dev *rt2x00dev)
|
||||
if (retval)
|
||||
return retval;
|
||||
|
||||
/*
|
||||
* This device has multiple filters for control frames,
|
||||
* but has no a separate filter for PS Poll frames.
|
||||
*/
|
||||
__set_bit(DRIVER_SUPPORT_CONTROL_FILTERS, &rt2x00dev->flags);
|
||||
|
||||
/*
|
||||
* This device requires firmware.
|
||||
*/
|
||||
|
Loading…
Reference in New Issue
Block a user