diff options
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt73usb.c')
-rw-r--r-- | drivers/net/wireless/rt2x00/rt73usb.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/net/wireless/rt2x00/rt73usb.c b/drivers/net/wireless/rt2x00/rt73usb.c index 4d576ab3e7f9..8103d41a1543 100644 --- a/drivers/net/wireless/rt2x00/rt73usb.c +++ b/drivers/net/wireless/rt2x00/rt73usb.c | |||
@@ -1208,8 +1208,12 @@ static int rt73usb_set_device_state(struct rt2x00_dev *rt2x00dev, | |||
1208 | rt73usb_disable_radio(rt2x00dev); | 1208 | rt73usb_disable_radio(rt2x00dev); |
1209 | break; | 1209 | break; |
1210 | case STATE_RADIO_RX_ON: | 1210 | case STATE_RADIO_RX_ON: |
1211 | case STATE_RADIO_RX_ON_LINK: | ||
1212 | rt73usb_toggle_rx(rt2x00dev, STATE_RADIO_RX_ON); | ||
1213 | break; | ||
1211 | case STATE_RADIO_RX_OFF: | 1214 | case STATE_RADIO_RX_OFF: |
1212 | rt73usb_toggle_rx(rt2x00dev, state); | 1215 | case STATE_RADIO_RX_OFF_LINK: |
1216 | rt73usb_toggle_rx(rt2x00dev, STATE_RADIO_RX_OFF); | ||
1213 | break; | 1217 | break; |
1214 | case STATE_DEEP_SLEEP: | 1218 | case STATE_DEEP_SLEEP: |
1215 | case STATE_SLEEP: | 1219 | case STATE_SLEEP: |
@@ -1865,9 +1869,9 @@ static void rt73usb_configure_filter(struct ieee80211_hw *hw, | |||
1865 | * Apply some rules to the filters: | 1869 | * Apply some rules to the filters: |
1866 | * - Some filters imply different filters to be set. | 1870 | * - Some filters imply different filters to be set. |
1867 | * - Some things we can't filter out at all. | 1871 | * - Some things we can't filter out at all. |
1872 | * - Multicast filter seems to kill broadcast traffic so never use it. | ||
1868 | */ | 1873 | */ |
1869 | if (mc_count) | 1874 | *total_flags |= FIF_ALLMULTI; |
1870 | *total_flags |= FIF_ALLMULTI; | ||
1871 | if (*total_flags & FIF_OTHER_BSS || | 1875 | if (*total_flags & FIF_OTHER_BSS || |
1872 | *total_flags & FIF_PROMISC_IN_BSS) | 1876 | *total_flags & FIF_PROMISC_IN_BSS) |
1873 | *total_flags |= FIF_PROMISC_IN_BSS | FIF_OTHER_BSS; | 1877 | *total_flags |= FIF_PROMISC_IN_BSS | FIF_OTHER_BSS; |
@@ -2094,6 +2098,7 @@ static struct usb_device_id rt73usb_device_table[] = { | |||
2094 | /* D-Link */ | 2098 | /* D-Link */ |
2095 | { USB_DEVICE(0x07d1, 0x3c03), USB_DEVICE_DATA(&rt73usb_ops) }, | 2099 | { USB_DEVICE(0x07d1, 0x3c03), USB_DEVICE_DATA(&rt73usb_ops) }, |
2096 | { USB_DEVICE(0x07d1, 0x3c04), USB_DEVICE_DATA(&rt73usb_ops) }, | 2100 | { USB_DEVICE(0x07d1, 0x3c04), USB_DEVICE_DATA(&rt73usb_ops) }, |
2101 | { USB_DEVICE(0x07d1, 0x3c07), USB_DEVICE_DATA(&rt73usb_ops) }, | ||
2097 | /* Gemtek */ | 2102 | /* Gemtek */ |
2098 | { USB_DEVICE(0x15a9, 0x0004), USB_DEVICE_DATA(&rt73usb_ops) }, | 2103 | { USB_DEVICE(0x15a9, 0x0004), USB_DEVICE_DATA(&rt73usb_ops) }, |
2099 | /* Gigabyte */ | 2104 | /* Gigabyte */ |