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

Commit 262c741e authored by Eli Cooper's avatar Eli Cooper Committed by Kalle Valo
Browse files

rt2x00: fix monitor mode regression 



Since commit df140465 ("mac80211: remove support for IFF_PROMISC")
monitor mode for rt2x00 has been made effectively useless because the
hardware filter is configured to drop packets whose intended recipient is
not the device, regardless of the presence of monitor mode interfaces.

This patch fixes this regression by adding explicit monitor mode support,
and by configuring the hardware filter accordingly.

Signed-off-by: default avatarEli Cooper <elicooper@gmx.com>
Acked-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent e0045bf8

drivers/net/wireless/ralink/rt2x00/rt2400pci.c

+3 −1
Original line number Diff line number Diff line
@@ -273,8 +273,10 @@ static void rt2400pci_config_filter(struct rt2x00_dev *rt2x00dev, 
			   !(filter_flags & FIF_PLCPFAIL));

	rt2x00_set_field32(&reg, RXCSR0_DROP_CONTROL,

			   !(filter_flags & FIF_CONTROL));

	rt2x00_set_field32(&reg, RXCSR0_DROP_NOT_TO_ME, 1);

	rt2x00_set_field32(&reg, RXCSR0_DROP_NOT_TO_ME,

			   !test_bit(CONFIG_MONITORING, &rt2x00dev->flags));

	rt2x00_set_field32(&reg, RXCSR0_DROP_TODS,

			   !test_bit(CONFIG_MONITORING, &rt2x00dev->flags) &&

			   !rt2x00dev->intf_ap_count);

	rt2x00_set_field32(&reg, RXCSR0_DROP_VERSION_ERROR, 1);

	rt2x00mmio_register_write(rt2x00dev, RXCSR0, reg);

drivers/net/wireless/ralink/rt2x00/rt2500pci.c

+3 −1
Original line number Diff line number Diff line
@@ -274,8 +274,10 @@ static void rt2500pci_config_filter(struct rt2x00_dev *rt2x00dev, 
			   !(filter_flags & FIF_PLCPFAIL));

	rt2x00_set_field32(&reg, RXCSR0_DROP_CONTROL,

			   !(filter_flags & FIF_CONTROL));

	rt2x00_set_field32(&reg, RXCSR0_DROP_NOT_TO_ME, 1);

	rt2x00_set_field32(&reg, RXCSR0_DROP_NOT_TO_ME,

			   !test_bit(CONFIG_MONITORING, &rt2x00dev->flags));

	rt2x00_set_field32(&reg, RXCSR0_DROP_TODS,

			   !test_bit(CONFIG_MONITORING, &rt2x00dev->flags) &&

			   !rt2x00dev->intf_ap_count);

	rt2x00_set_field32(&reg, RXCSR0_DROP_VERSION_ERROR, 1);

	rt2x00_set_field32(&reg, RXCSR0_DROP_MCAST,

drivers/net/wireless/ralink/rt2x00/rt2500usb.c

+3 −1
Original line number Diff line number Diff line
@@ -437,8 +437,10 @@ static void rt2500usb_config_filter(struct rt2x00_dev *rt2x00dev, 
			   !(filter_flags & FIF_PLCPFAIL));

	rt2x00_set_field16(&reg, TXRX_CSR2_DROP_CONTROL,

			   !(filter_flags & FIF_CONTROL));

	rt2x00_set_field16(&reg, TXRX_CSR2_DROP_NOT_TO_ME, 1);

	rt2x00_set_field16(&reg, TXRX_CSR2_DROP_NOT_TO_ME,

			   !test_bit(CONFIG_MONITORING, &rt2x00dev->flags));

	rt2x00_set_field16(&reg, TXRX_CSR2_DROP_TODS,

			   !test_bit(CONFIG_MONITORING, &rt2x00dev->flags) &&

			   !rt2x00dev->intf_ap_count);

	rt2x00_set_field16(&reg, TXRX_CSR2_DROP_VERSION_ERROR, 1);

	rt2x00_set_field16(&reg, TXRX_CSR2_DROP_MULTICAST,

drivers/net/wireless/ralink/rt2x00/rt2800lib.c

+2 −1
Original line number Diff line number Diff line
@@ -1490,7 +1490,8 @@ void rt2800_config_filter(struct rt2x00_dev *rt2x00dev, 
			   !(filter_flags & FIF_FCSFAIL));

	rt2x00_set_field32(&reg, RX_FILTER_CFG_DROP_PHY_ERROR,

			   !(filter_flags & FIF_PLCPFAIL));

	rt2x00_set_field32(&reg, RX_FILTER_CFG_DROP_NOT_TO_ME, 1);

	rt2x00_set_field32(&reg, RX_FILTER_CFG_DROP_NOT_TO_ME,

			   !test_bit(CONFIG_MONITORING, &rt2x00dev->flags));

	rt2x00_set_field32(&reg, RX_FILTER_CFG_DROP_NOT_MY_BSSD, 0);

	rt2x00_set_field32(&reg, RX_FILTER_CFG_DROP_VER_ERROR, 1);

	rt2x00_set_field32(&reg, RX_FILTER_CFG_DROP_MULTICAST,

drivers/net/wireless/ralink/rt2x00/rt2x00.h

+1 −0
Original line number Diff line number Diff line
@@ -669,6 +669,7 @@ enum rt2x00_state_flags { 
	CONFIG_POWERSAVING,

	CONFIG_HT_DISABLED,

	CONFIG_QOS_DISABLED,

	CONFIG_MONITORING,



	/*

	 * Mark we currently are sequentially reading TX_STA_FIFO register