projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cfg80211: remove enum ieee80211_band
[cascardo/linux.git]
/
drivers
/
net
/
wireless
/
ralink
/
rt2x00
/
rt61pci.c
diff --git
a/drivers/net/wireless/ralink/rt2x00/rt61pci.c
b/drivers/net/wireless/ralink/rt2x00/rt61pci.c
index
24a3436
..
03013eb
100644
(file)
--- a/
drivers/net/wireless/ralink/rt2x00/rt61pci.c
+++ b/
drivers/net/wireless/ralink/rt2x00/rt61pci.c
@@
-252,9
+252,9
@@
static void rt61pci_brightness_set(struct led_classdev *led_cdev,
container_of(led_cdev, struct rt2x00_led, led_dev);
unsigned int enabled = brightness != LED_OFF;
unsigned int a_mode =
container_of(led_cdev, struct rt2x00_led, led_dev);
unsigned int enabled = brightness != LED_OFF;
unsigned int a_mode =
- (enabled && led->rt2x00dev->curr_band ==
IEEE
80211_BAND_5GHZ);
+ (enabled && led->rt2x00dev->curr_band ==
NL
80211_BAND_5GHZ);
unsigned int bg_mode =
unsigned int bg_mode =
- (enabled && led->rt2x00dev->curr_band ==
IEEE
80211_BAND_2GHZ);
+ (enabled && led->rt2x00dev->curr_band ==
NL
80211_BAND_2GHZ);
if (led->type == LED_TYPE_RADIO) {
rt2x00_set_field16(&led->rt2x00dev->led_mcu_reg,
if (led->type == LED_TYPE_RADIO) {
rt2x00_set_field16(&led->rt2x00dev->led_mcu_reg,
@@
-643,12
+643,12
@@
static void rt61pci_config_antenna_5x(struct rt2x00_dev *rt2x00dev,
case ANTENNA_HW_DIVERSITY:
rt2x00_set_field8(&r4, BBP_R4_RX_ANTENNA_CONTROL, 2);
rt2x00_set_field8(&r4, BBP_R4_RX_FRAME_END,
case ANTENNA_HW_DIVERSITY:
rt2x00_set_field8(&r4, BBP_R4_RX_ANTENNA_CONTROL, 2);
rt2x00_set_field8(&r4, BBP_R4_RX_FRAME_END,
- (rt2x00dev->curr_band !=
IEEE
80211_BAND_5GHZ));
+ (rt2x00dev->curr_band !=
NL
80211_BAND_5GHZ));
break;
case ANTENNA_A:
rt2x00_set_field8(&r4, BBP_R4_RX_ANTENNA_CONTROL, 1);
rt2x00_set_field8(&r4, BBP_R4_RX_FRAME_END, 0);
break;
case ANTENNA_A:
rt2x00_set_field8(&r4, BBP_R4_RX_ANTENNA_CONTROL, 1);
rt2x00_set_field8(&r4, BBP_R4_RX_FRAME_END, 0);
- if (rt2x00dev->curr_band ==
IEEE
80211_BAND_5GHZ)
+ if (rt2x00dev->curr_band ==
NL
80211_BAND_5GHZ)
rt2x00_set_field8(&r77, BBP_R77_RX_ANTENNA, 0);
else
rt2x00_set_field8(&r77, BBP_R77_RX_ANTENNA, 3);
rt2x00_set_field8(&r77, BBP_R77_RX_ANTENNA, 0);
else
rt2x00_set_field8(&r77, BBP_R77_RX_ANTENNA, 3);
@@
-657,7
+657,7
@@
static void rt61pci_config_antenna_5x(struct rt2x00_dev *rt2x00dev,
default:
rt2x00_set_field8(&r4, BBP_R4_RX_ANTENNA_CONTROL, 1);
rt2x00_set_field8(&r4, BBP_R4_RX_FRAME_END, 0);
default:
rt2x00_set_field8(&r4, BBP_R4_RX_ANTENNA_CONTROL, 1);
rt2x00_set_field8(&r4, BBP_R4_RX_FRAME_END, 0);
- if (rt2x00dev->curr_band ==
IEEE
80211_BAND_5GHZ)
+ if (rt2x00dev->curr_band ==
NL
80211_BAND_5GHZ)
rt2x00_set_field8(&r77, BBP_R77_RX_ANTENNA, 3);
else
rt2x00_set_field8(&r77, BBP_R77_RX_ANTENNA, 0);
rt2x00_set_field8(&r77, BBP_R77_RX_ANTENNA, 3);
else
rt2x00_set_field8(&r77, BBP_R77_RX_ANTENNA, 0);
@@
-808,7
+808,7
@@
static void rt61pci_config_ant(struct rt2x00_dev *rt2x00dev,
BUG_ON(ant->rx == ANTENNA_SW_DIVERSITY ||
ant->tx == ANTENNA_SW_DIVERSITY);
BUG_ON(ant->rx == ANTENNA_SW_DIVERSITY ||
ant->tx == ANTENNA_SW_DIVERSITY);
- if (rt2x00dev->curr_band ==
IEEE
80211_BAND_5GHZ) {
+ if (rt2x00dev->curr_band ==
NL
80211_BAND_5GHZ) {
sel = antenna_sel_a;
lna = rt2x00_has_cap_external_lna_a(rt2x00dev);
} else {
sel = antenna_sel_a;
lna = rt2x00_has_cap_external_lna_a(rt2x00dev);
} else {
@@
-822,9
+822,9
@@
static void rt61pci_config_ant(struct rt2x00_dev *rt2x00dev,
rt2x00mmio_register_read(rt2x00dev, PHY_CSR0, ®);
rt2x00_set_field32(®, PHY_CSR0_PA_PE_BG,
rt2x00mmio_register_read(rt2x00dev, PHY_CSR0, ®);
rt2x00_set_field32(®, PHY_CSR0_PA_PE_BG,
- rt2x00dev->curr_band ==
IEEE
80211_BAND_2GHZ);
+ rt2x00dev->curr_band ==
NL
80211_BAND_2GHZ);
rt2x00_set_field32(®, PHY_CSR0_PA_PE_A,
rt2x00_set_field32(®, PHY_CSR0_PA_PE_A,
- rt2x00dev->curr_band ==
IEEE
80211_BAND_5GHZ);
+ rt2x00dev->curr_band ==
NL
80211_BAND_5GHZ);
rt2x00mmio_register_write(rt2x00dev, PHY_CSR0, reg);
rt2x00mmio_register_write(rt2x00dev, PHY_CSR0, reg);
@@
-846,7
+846,7
@@
static void rt61pci_config_lna_gain(struct rt2x00_dev *rt2x00dev,
u16 eeprom;
short lna_gain = 0;
u16 eeprom;
short lna_gain = 0;
- if (libconf->conf->chandef.chan->band ==
IEEE
80211_BAND_2GHZ) {
+ if (libconf->conf->chandef.chan->band ==
NL
80211_BAND_2GHZ) {
if (rt2x00_has_cap_external_lna_bg(rt2x00dev))
lna_gain += 14;
if (rt2x00_has_cap_external_lna_bg(rt2x00dev))
lna_gain += 14;
@@
-1048,7
+1048,7
@@
static void rt61pci_link_tuner(struct rt2x00_dev *rt2x00dev,
/*
* Determine r17 bounds.
*/
/*
* Determine r17 bounds.
*/
- if (rt2x00dev->curr_band ==
IEEE
80211_BAND_5GHZ) {
+ if (rt2x00dev->curr_band ==
NL
80211_BAND_5GHZ) {
low_bound = 0x28;
up_bound = 0x48;
if (rt2x00_has_cap_external_lna_a(rt2x00dev)) {
low_bound = 0x28;
up_bound = 0x48;
if (rt2x00_has_cap_external_lna_a(rt2x00dev)) {
@@
-2077,7
+2077,7
@@
static int rt61pci_agc_to_rssi(struct rt2x00_dev *rt2x00dev, int rxd_w1)
return 0;
}
return 0;
}
- if (rt2x00dev->curr_band ==
IEEE
80211_BAND_5GHZ) {
+ if (rt2x00dev->curr_band ==
NL
80211_BAND_5GHZ) {
if (lna == 3 || lna == 2)
offset += 10;
}
if (lna == 3 || lna == 2)
offset += 10;
}