diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2016-03-04 12:12:08 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-03-04 12:12:08 +0100 |
| commit | bc94b99636dc7bcccce439a9fb9c00065e2e2627 (patch) | |
| tree | bddbd29a5fd7b2d270d039efc1d6858791a2c98f /drivers/net/wireless/ralink/rt2x00/rt2500usb.c | |
| parent | ACPI/EINJ: Allow memory error injection to NVDIMM (diff) | |
| parent | Linux 4.5-rc6 (diff) | |
| download | linux-dev-bc94b99636dc7bcccce439a9fb9c00065e2e2627.tar.xz linux-dev-bc94b99636dc7bcccce439a9fb9c00065e2e2627.zip | |
Merge tag 'v4.5-rc6' into core/resources, to resolve conflict
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/net/wireless/ralink/rt2x00/rt2500usb.c')
| -rw-r--r-- | drivers/net/wireless/ralink/rt2x00/rt2500usb.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/ralink/rt2x00/rt2500usb.c b/drivers/net/wireless/ralink/rt2x00/rt2500usb.c index d26018f30b7d..2d64611de300 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2500usb.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2500usb.c @@ -437,8 +437,10 @@ static void rt2500usb_config_filter(struct rt2x00_dev *rt2x00dev, !(filter_flags & FIF_PLCPFAIL)); rt2x00_set_field16(®, TXRX_CSR2_DROP_CONTROL, !(filter_flags & FIF_CONTROL)); - rt2x00_set_field16(®, TXRX_CSR2_DROP_NOT_TO_ME, 1); + rt2x00_set_field16(®, TXRX_CSR2_DROP_NOT_TO_ME, + !test_bit(CONFIG_MONITORING, &rt2x00dev->flags)); rt2x00_set_field16(®, TXRX_CSR2_DROP_TODS, + !test_bit(CONFIG_MONITORING, &rt2x00dev->flags) && !rt2x00dev->intf_ap_count); rt2x00_set_field16(®, TXRX_CSR2_DROP_VERSION_ERROR, 1); rt2x00_set_field16(®, TXRX_CSR2_DROP_MULTICAST, |