package/kernel/mac80211/patches/303-rt2x00-fix-monitor-mode-regression.patch

   1 From: Eli Cooper <elicooper@gmx.com>
   2 Date: Thu, 14 Jan 2016 00:07:12 +0800
   3 Subject: [PATCH] rt2x00: fix monitor mode regression
   4
   5 Since commit df1404650ccbfeb76a84f301f22316be0d00a864 monitor mode for rt2x00
   6 has been made effectively useless because the hardware filter is configured to
   7 drop packets whose intended recipient is not the device, regardless of the
   8 presence of monitor mode interfaces.
   9
  10 This patch fixes this regression by adding explicit monitor mode support, and
  11 configuring the hardware filter accordingly.
  12
  13 Signed-off-by: Eli Cooper <elicooper@gmx.com>
  14 ---
  15
  16 --- a/drivers/net/wireless/ralink/rt2x00/rt2400pci.c
  17 +++ b/drivers/net/wireless/ralink/rt2x00/rt2400pci.c
  18 @@ -273,8 +273,10 @@ static void rt2400pci_config_filter(stru
  19                            !(filter_flags & FIF_PLCPFAIL));
  20         rt2x00_set_field32(&reg, RXCSR0_DROP_CONTROL,
  21                            !(filter_flags & FIF_CONTROL));
  22 -       rt2x00_set_field32(&reg, RXCSR0_DROP_NOT_TO_ME, 1);
  23 +       rt2x00_set_field32(&reg, RXCSR0_DROP_NOT_TO_ME,
  24 +                          !rt2x00dev->is_monitoring);
  25         rt2x00_set_field32(&reg, RXCSR0_DROP_TODS,
  26 +                          !rt2x00dev->is_monitoring &&
  27                            !rt2x00dev->intf_ap_count);
  28         rt2x00_set_field32(&reg, RXCSR0_DROP_VERSION_ERROR, 1);
  29         rt2x00mmio_register_write(rt2x00dev, RXCSR0, reg);
  30 --- a/drivers/net/wireless/ralink/rt2x00/rt2500pci.c
  31 +++ b/drivers/net/wireless/ralink/rt2x00/rt2500pci.c
  32 @@ -274,8 +274,10 @@ static void rt2500pci_config_filter(stru
  33                            !(filter_flags & FIF_PLCPFAIL));
  34         rt2x00_set_field32(&reg, RXCSR0_DROP_CONTROL,
  35                            !(filter_flags & FIF_CONTROL));
  36 -       rt2x00_set_field32(&reg, RXCSR0_DROP_NOT_TO_ME, 1);
  37 +       rt2x00_set_field32(&reg, RXCSR0_DROP_NOT_TO_ME,
  38 +                          !rt2x00dev->is_monitoring);
  39         rt2x00_set_field32(&reg, RXCSR0_DROP_TODS,
  40 +                          !rt2x00dev->is_monitoring &&
  41                            !rt2x00dev->intf_ap_count);
  42         rt2x00_set_field32(&reg, RXCSR0_DROP_VERSION_ERROR, 1);
  43         rt2x00_set_field32(&reg, RXCSR0_DROP_MCAST,
  44 --- a/drivers/net/wireless/ralink/rt2x00/rt2500usb.c
  45 +++ b/drivers/net/wireless/ralink/rt2x00/rt2500usb.c
  46 @@ -437,8 +437,10 @@ static void rt2500usb_config_filter(stru
  47                            !(filter_flags & FIF_PLCPFAIL));
  48         rt2x00_set_field16(&reg, TXRX_CSR2_DROP_CONTROL,
  49                            !(filter_flags & FIF_CONTROL));
  50 -       rt2x00_set_field16(&reg, TXRX_CSR2_DROP_NOT_TO_ME, 1);
  51 +       rt2x00_set_field16(&reg, TXRX_CSR2_DROP_NOT_TO_ME,
  52 +                          !rt2x00dev->is_monitoring);
  53         rt2x00_set_field16(&reg, TXRX_CSR2_DROP_TODS,
  54 +                          !rt2x00dev->is_monitoring &&
  55                            !rt2x00dev->intf_ap_count);
  56         rt2x00_set_field16(&reg, TXRX_CSR2_DROP_VERSION_ERROR, 1);
  57         rt2x00_set_field16(&reg, TXRX_CSR2_DROP_MULTICAST,
  58 --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
  59 +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
  60 @@ -1490,7 +1490,8 @@ void rt2800_config_filter(struct rt2x00_
  61                            !(filter_flags & FIF_FCSFAIL));
  62         rt2x00_set_field32(&reg, RX_FILTER_CFG_DROP_PHY_ERROR,
  63                            !(filter_flags & FIF_PLCPFAIL));
  64 -       rt2x00_set_field32(&reg, RX_FILTER_CFG_DROP_NOT_TO_ME, 1);
  65 +       rt2x00_set_field32(&reg, RX_FILTER_CFG_DROP_NOT_TO_ME,
  66 +                          !rt2x00dev->is_monitoring);
  67         rt2x00_set_field32(&reg, RX_FILTER_CFG_DROP_NOT_MY_BSSD, 0);
  68         rt2x00_set_field32(&reg, RX_FILTER_CFG_DROP_VER_ERROR, 1);
  69         rt2x00_set_field32(&reg, RX_FILTER_CFG_DROP_MULTICAST,
  70 --- a/drivers/net/wireless/ralink/rt2x00/rt2x00.h
  71 +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00.h
  72 @@ -844,11 +844,13 @@ struct rt2x00_dev {
  73          *  - Open sta interface count.
  74          *  - Association count.
  75          *  - Beaconing enabled count.
  76 +        *  - Whether the device is monitoring.
  77          */
  78         unsigned int intf_ap_count;
  79         unsigned int intf_sta_count;
  80         unsigned int intf_associated;
  81         unsigned int intf_beaconing;
  82 +       bool is_monitoring;
  83
  84         /*
  85          * Interface combinations
  86 --- a/drivers/net/wireless/ralink/rt2x00/rt2x00config.c
  87 +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00config.c
  88 @@ -244,6 +244,16 @@ void rt2x00lib_config(struct rt2x00_dev
  89             (ieee80211_flags & IEEE80211_CONF_CHANGE_PS))
  90                 cancel_delayed_work_sync(&rt2x00dev->autowakeup_work);
  91
  92 +       if (ieee80211_flags & IEEE80211_CONF_CHANGE_MONITOR) {
  93 +               if (conf->flags & IEEE80211_CONF_MONITOR) {
  94 +                       rt2x00_dbg(rt2x00dev, "Monitor mode is enabled\n");
  95 +                       rt2x00dev->is_monitoring = true;
  96 +               } else {
  97 +                       rt2x00_dbg(rt2x00dev, "Monitor mode is disabled\n");
  98 +                       rt2x00dev->is_monitoring = false;
  99 +               }
 100 +       }
 101 +
 102         /*
 103          * Start configuration.
 104          */
 105 --- a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c
 106 +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c
 107 @@ -1204,6 +1204,7 @@ int rt2x00lib_start(struct rt2x00_dev *r
 108         rt2x00dev->intf_ap_count = 0;
 109         rt2x00dev->intf_sta_count = 0;
 110         rt2x00dev->intf_associated = 0;
 111 +       rt2x00dev->is_monitoring = false;
 112
 113         /* Enable the radio */
 114         retval = rt2x00lib_enable_radio(rt2x00dev);
 115 --- a/drivers/net/wireless/ralink/rt2x00/rt2x00mac.c
 116 +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00mac.c
 117 @@ -385,11 +385,6 @@ void rt2x00mac_configure_filter(struct i
 118                         *total_flags |= FIF_PSPOLL;
 119         }
 120
 121 -       /*
 122 -        * Check if there is any work left for us.
 123 -        */
 124 -       if (rt2x00dev->packet_filter == *total_flags)
 125 -               return;
 126         rt2x00dev->packet_filter = *total_flags;
 127
 128         rt2x00dev->ops->lib->config_filter(rt2x00dev, *total_flags);
 129 --- a/drivers/net/wireless/ralink/rt2x00/rt61pci.c
 130 +++ b/drivers/net/wireless/ralink/rt2x00/rt61pci.c
 131 @@ -530,8 +530,10 @@ static void rt61pci_config_filter(struct
 132                            !(filter_flags & FIF_PLCPFAIL));
 133         rt2x00_set_field32(&reg, TXRX_CSR0_DROP_CONTROL,
 134                            !(filter_flags & (FIF_CONTROL | FIF_PSPOLL)));
 135 -       rt2x00_set_field32(&reg, TXRX_CSR0_DROP_NOT_TO_ME, 1);
 136 +       rt2x00_set_field32(&reg, TXRX_CSR0_DROP_NOT_TO_ME,
 137 +                          !rt2x00dev->is_monitoring);
 138         rt2x00_set_field32(&reg, TXRX_CSR0_DROP_TO_DS,
 139 +                          !rt2x00dev->is_monitoring &&
 140                            !rt2x00dev->intf_ap_count);
 141         rt2x00_set_field32(&reg, TXRX_CSR0_DROP_VERSION_ERROR, 1);
 142         rt2x00_set_field32(&reg, TXRX_CSR0_DROP_MULTICAST,
 143 --- a/drivers/net/wireless/ralink/rt2x00/rt73usb.c
 144 +++ b/drivers/net/wireless/ralink/rt2x00/rt73usb.c
 145 @@ -480,8 +480,10 @@ static void rt73usb_config_filter(struct
 146                            !(filter_flags & FIF_PLCPFAIL));
 147         rt2x00_set_field32(&reg, TXRX_CSR0_DROP_CONTROL,
 148                            !(filter_flags & (FIF_CONTROL | FIF_PSPOLL)));
 149 -       rt2x00_set_field32(&reg, TXRX_CSR0_DROP_NOT_TO_ME, 1);
 150 +       rt2x00_set_field32(&reg, TXRX_CSR0_DROP_NOT_TO_ME,
 151 +                          !rt2x00dev->is_monitoring);
 152         rt2x00_set_field32(&reg, TXRX_CSR0_DROP_TO_DS,
 153 +                          !rt2x00dev->is_monitoring &&
 154                            !rt2x00dev->intf_ap_count);
 155         rt2x00_set_field32(&reg, TXRX_CSR0_DROP_VERSION_ERROR, 1);
 156         rt2x00_set_field32(&reg, TXRX_CSR0_DROP_MULTICAST,