diff options
Diffstat (limited to 'drivers/net/wireless/ralink/rt2x00/rt73usb.c')
| -rw-r--r-- | drivers/net/wireless/ralink/rt2x00/rt73usb.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/net/wireless/ralink/rt2x00/rt73usb.c b/drivers/net/wireless/ralink/rt2x00/rt73usb.c index 7bbc86931168..c1397a6d3cee 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt73usb.c +++ b/drivers/net/wireless/ralink/rt2x00/rt73usb.c | |||
| @@ -197,9 +197,9 @@ static void rt73usb_brightness_set(struct led_classdev *led_cdev, | |||
| 197 | container_of(led_cdev, struct rt2x00_led, led_dev); | 197 | container_of(led_cdev, struct rt2x00_led, led_dev); |
| 198 | unsigned int enabled = brightness != LED_OFF; | 198 | unsigned int enabled = brightness != LED_OFF; |
| 199 | unsigned int a_mode = | 199 | unsigned int a_mode = |
| 200 | (enabled && led->rt2x00dev->curr_band == IEEE80211_BAND_5GHZ); | 200 | (enabled && led->rt2x00dev->curr_band == NL80211_BAND_5GHZ); |
| 201 | unsigned int bg_mode = | 201 | unsigned int bg_mode = |
| 202 | (enabled && led->rt2x00dev->curr_band == IEEE80211_BAND_2GHZ); | 202 | (enabled && led->rt2x00dev->curr_band == NL80211_BAND_2GHZ); |
| 203 | 203 | ||
| 204 | if (led->type == LED_TYPE_RADIO) { | 204 | if (led->type == LED_TYPE_RADIO) { |
| 205 | rt2x00_set_field16(&led->rt2x00dev->led_mcu_reg, | 205 | rt2x00_set_field16(&led->rt2x00dev->led_mcu_reg, |
| @@ -593,13 +593,13 @@ static void rt73usb_config_antenna_5x(struct rt2x00_dev *rt2x00dev, | |||
| 593 | case ANTENNA_HW_DIVERSITY: | 593 | case ANTENNA_HW_DIVERSITY: |
| 594 | rt2x00_set_field8(&r4, BBP_R4_RX_ANTENNA_CONTROL, 2); | 594 | rt2x00_set_field8(&r4, BBP_R4_RX_ANTENNA_CONTROL, 2); |
| 595 | temp = !rt2x00_has_cap_frame_type(rt2x00dev) && | 595 | temp = !rt2x00_has_cap_frame_type(rt2x00dev) && |
| 596 | (rt2x00dev->curr_band != IEEE80211_BAND_5GHZ); | 596 | (rt2x00dev->curr_band != NL80211_BAND_5GHZ); |
| 597 | rt2x00_set_field8(&r4, BBP_R4_RX_FRAME_END, temp); | 597 | rt2x00_set_field8(&r4, BBP_R4_RX_FRAME_END, temp); |
| 598 | break; | 598 | break; |
| 599 | case ANTENNA_A: | 599 | case ANTENNA_A: |
| 600 | rt2x00_set_field8(&r4, BBP_R4_RX_ANTENNA_CONTROL, 1); | 600 | rt2x00_set_field8(&r4, BBP_R4_RX_ANTENNA_CONTROL, 1); |
| 601 | rt2x00_set_field8(&r4, BBP_R4_RX_FRAME_END, 0); | 601 | rt2x00_set_field8(&r4, BBP_R4_RX_FRAME_END, 0); |
| 602 | if (rt2x00dev->curr_band == IEEE80211_BAND_5GHZ) | 602 | if (rt2x00dev->curr_band == NL80211_BAND_5GHZ) |
| 603 | rt2x00_set_field8(&r77, BBP_R77_RX_ANTENNA, 0); | 603 | rt2x00_set_field8(&r77, BBP_R77_RX_ANTENNA, 0); |
| 604 | else | 604 | else |
| 605 | rt2x00_set_field8(&r77, BBP_R77_RX_ANTENNA, 3); | 605 | rt2x00_set_field8(&r77, BBP_R77_RX_ANTENNA, 3); |
| @@ -608,7 +608,7 @@ static void rt73usb_config_antenna_5x(struct rt2x00_dev *rt2x00dev, | |||
| 608 | default: | 608 | default: |
| 609 | rt2x00_set_field8(&r4, BBP_R4_RX_ANTENNA_CONTROL, 1); | 609 | rt2x00_set_field8(&r4, BBP_R4_RX_ANTENNA_CONTROL, 1); |
| 610 | rt2x00_set_field8(&r4, BBP_R4_RX_FRAME_END, 0); | 610 | rt2x00_set_field8(&r4, BBP_R4_RX_FRAME_END, 0); |
| 611 | if (rt2x00dev->curr_band == IEEE80211_BAND_5GHZ) | 611 | if (rt2x00dev->curr_band == NL80211_BAND_5GHZ) |
| 612 | rt2x00_set_field8(&r77, BBP_R77_RX_ANTENNA, 3); | 612 | rt2x00_set_field8(&r77, BBP_R77_RX_ANTENNA, 3); |
| 613 | else | 613 | else |
| 614 | rt2x00_set_field8(&r77, BBP_R77_RX_ANTENNA, 0); | 614 | rt2x00_set_field8(&r77, BBP_R77_RX_ANTENNA, 0); |
| @@ -704,7 +704,7 @@ static void rt73usb_config_ant(struct rt2x00_dev *rt2x00dev, | |||
| 704 | BUG_ON(ant->rx == ANTENNA_SW_DIVERSITY || | 704 | BUG_ON(ant->rx == ANTENNA_SW_DIVERSITY || |
| 705 | ant->tx == ANTENNA_SW_DIVERSITY); | 705 | ant->tx == ANTENNA_SW_DIVERSITY); |
| 706 | 706 | ||
| 707 | if (rt2x00dev->curr_band == IEEE80211_BAND_5GHZ) { | 707 | if (rt2x00dev->curr_band == NL80211_BAND_5GHZ) { |
| 708 | sel = antenna_sel_a; | 708 | sel = antenna_sel_a; |
| 709 | lna = rt2x00_has_cap_external_lna_a(rt2x00dev); | 709 | lna = rt2x00_has_cap_external_lna_a(rt2x00dev); |
| 710 | } else { | 710 | } else { |
| @@ -718,9 +718,9 @@ static void rt73usb_config_ant(struct rt2x00_dev *rt2x00dev, | |||
| 718 | rt2x00usb_register_read(rt2x00dev, PHY_CSR0, ®); | 718 | rt2x00usb_register_read(rt2x00dev, PHY_CSR0, ®); |
| 719 | 719 | ||
| 720 | rt2x00_set_field32(®, PHY_CSR0_PA_PE_BG, | 720 | rt2x00_set_field32(®, PHY_CSR0_PA_PE_BG, |
| 721 | (rt2x00dev->curr_band == IEEE80211_BAND_2GHZ)); | 721 | (rt2x00dev->curr_band == NL80211_BAND_2GHZ)); |
| 722 | rt2x00_set_field32(®, PHY_CSR0_PA_PE_A, | 722 | rt2x00_set_field32(®, PHY_CSR0_PA_PE_A, |
| 723 | (rt2x00dev->curr_band == IEEE80211_BAND_5GHZ)); | 723 | (rt2x00dev->curr_band == NL80211_BAND_5GHZ)); |
| 724 | 724 | ||
| 725 | rt2x00usb_register_write(rt2x00dev, PHY_CSR0, reg); | 725 | rt2x00usb_register_write(rt2x00dev, PHY_CSR0, reg); |
| 726 | 726 | ||
| @@ -736,7 +736,7 @@ static void rt73usb_config_lna_gain(struct rt2x00_dev *rt2x00dev, | |||
| 736 | u16 eeprom; | 736 | u16 eeprom; |
| 737 | short lna_gain = 0; | 737 | short lna_gain = 0; |
| 738 | 738 | ||
| 739 | if (libconf->conf->chandef.chan->band == IEEE80211_BAND_2GHZ) { | 739 | if (libconf->conf->chandef.chan->band == NL80211_BAND_2GHZ) { |
| 740 | if (rt2x00_has_cap_external_lna_bg(rt2x00dev)) | 740 | if (rt2x00_has_cap_external_lna_bg(rt2x00dev)) |
| 741 | lna_gain += 14; | 741 | lna_gain += 14; |
| 742 | 742 | ||
| @@ -923,7 +923,7 @@ static void rt73usb_link_tuner(struct rt2x00_dev *rt2x00dev, | |||
| 923 | /* | 923 | /* |
| 924 | * Determine r17 bounds. | 924 | * Determine r17 bounds. |
| 925 | */ | 925 | */ |
| 926 | if (rt2x00dev->curr_band == IEEE80211_BAND_5GHZ) { | 926 | if (rt2x00dev->curr_band == NL80211_BAND_5GHZ) { |
| 927 | low_bound = 0x28; | 927 | low_bound = 0x28; |
| 928 | up_bound = 0x48; | 928 | up_bound = 0x48; |
| 929 | 929 | ||
| @@ -1657,7 +1657,7 @@ static int rt73usb_agc_to_rssi(struct rt2x00_dev *rt2x00dev, int rxd_w1) | |||
| 1657 | return 0; | 1657 | return 0; |
| 1658 | } | 1658 | } |
| 1659 | 1659 | ||
| 1660 | if (rt2x00dev->curr_band == IEEE80211_BAND_5GHZ) { | 1660 | if (rt2x00dev->curr_band == NL80211_BAND_5GHZ) { |
| 1661 | if (rt2x00_has_cap_external_lna_a(rt2x00dev)) { | 1661 | if (rt2x00_has_cap_external_lna_a(rt2x00dev)) { |
| 1662 | if (lna == 3 || lna == 2) | 1662 | if (lna == 3 || lna == 2) |
| 1663 | offset += 10; | 1663 | offset += 10; |
