parent
700589cd9b
commit
9337c97584
@ -0,0 +1,470 @@ |
||||
--- a/net/mac80211/led.c
|
||||
+++ b/net/mac80211/led.c
|
||||
@@ -54,12 +54,22 @@ void ieee80211_led_radio(struct ieee8021
|
||||
led_trigger_event(local->radio_led, LED_OFF);
|
||||
}
|
||||
|
||||
+void ieee80211_led_names(struct ieee80211_local *local)
|
||||
+{
|
||||
+ snprintf(local->rx_led_name, sizeof(local->rx_led_name),
|
||||
+ "%srx", wiphy_name(local->hw.wiphy));
|
||||
+ snprintf(local->tx_led_name, sizeof(local->tx_led_name),
|
||||
+ "%stx", wiphy_name(local->hw.wiphy));
|
||||
+ snprintf(local->assoc_led_name, sizeof(local->assoc_led_name),
|
||||
+ "%sassoc", wiphy_name(local->hw.wiphy));
|
||||
+ snprintf(local->radio_led_name, sizeof(local->radio_led_name),
|
||||
+ "%sradio", wiphy_name(local->hw.wiphy));
|
||||
+}
|
||||
+
|
||||
void ieee80211_led_init(struct ieee80211_local *local)
|
||||
{
|
||||
local->rx_led = kzalloc(sizeof(struct led_trigger), GFP_KERNEL);
|
||||
if (local->rx_led) {
|
||||
- snprintf(local->rx_led_name, sizeof(local->rx_led_name),
|
||||
- "%srx", wiphy_name(local->hw.wiphy));
|
||||
local->rx_led->name = local->rx_led_name;
|
||||
if (led_trigger_register(local->rx_led)) {
|
||||
kfree(local->rx_led);
|
||||
@@ -69,8 +79,6 @@ void ieee80211_led_init(struct ieee80211
|
||||
|
||||
local->tx_led = kzalloc(sizeof(struct led_trigger), GFP_KERNEL);
|
||||
if (local->tx_led) {
|
||||
- snprintf(local->tx_led_name, sizeof(local->tx_led_name),
|
||||
- "%stx", wiphy_name(local->hw.wiphy));
|
||||
local->tx_led->name = local->tx_led_name;
|
||||
if (led_trigger_register(local->tx_led)) {
|
||||
kfree(local->tx_led);
|
||||
@@ -80,8 +88,6 @@ void ieee80211_led_init(struct ieee80211
|
||||
|
||||
local->assoc_led = kzalloc(sizeof(struct led_trigger), GFP_KERNEL);
|
||||
if (local->assoc_led) {
|
||||
- snprintf(local->assoc_led_name, sizeof(local->assoc_led_name),
|
||||
- "%sassoc", wiphy_name(local->hw.wiphy));
|
||||
local->assoc_led->name = local->assoc_led_name;
|
||||
if (led_trigger_register(local->assoc_led)) {
|
||||
kfree(local->assoc_led);
|
||||
@@ -91,14 +97,19 @@ void ieee80211_led_init(struct ieee80211
|
||||
|
||||
local->radio_led = kzalloc(sizeof(struct led_trigger), GFP_KERNEL);
|
||||
if (local->radio_led) {
|
||||
- snprintf(local->radio_led_name, sizeof(local->radio_led_name),
|
||||
- "%sradio", wiphy_name(local->hw.wiphy));
|
||||
local->radio_led->name = local->radio_led_name;
|
||||
if (led_trigger_register(local->radio_led)) {
|
||||
kfree(local->radio_led);
|
||||
local->radio_led = NULL;
|
||||
}
|
||||
}
|
||||
+
|
||||
+ if (local->tpt_led_trigger) {
|
||||
+ if (led_trigger_register(&local->tpt_led_trigger->trig)) {
|
||||
+ kfree(local->tpt_led_trigger);
|
||||
+ local->tpt_led_trigger = NULL;
|
||||
+ }
|
||||
+ }
|
||||
}
|
||||
|
||||
void ieee80211_led_exit(struct ieee80211_local *local)
|
||||
@@ -119,15 +130,18 @@ void ieee80211_led_exit(struct ieee80211
|
||||
led_trigger_unregister(local->rx_led);
|
||||
kfree(local->rx_led);
|
||||
}
|
||||
+
|
||||
+ if (local->tpt_led_trigger) {
|
||||
+ led_trigger_unregister(&local->tpt_led_trigger->trig);
|
||||
+ kfree(local->tpt_led_trigger);
|
||||
+ }
|
||||
}
|
||||
|
||||
char *__ieee80211_get_radio_led_name(struct ieee80211_hw *hw)
|
||||
{
|
||||
struct ieee80211_local *local = hw_to_local(hw);
|
||||
|
||||
- if (local->radio_led)
|
||||
- return local->radio_led_name;
|
||||
- return NULL;
|
||||
+ return local->radio_led_name;
|
||||
}
|
||||
EXPORT_SYMBOL(__ieee80211_get_radio_led_name);
|
||||
|
||||
@@ -135,9 +149,7 @@ char *__ieee80211_get_assoc_led_name(str
|
||||
{
|
||||
struct ieee80211_local *local = hw_to_local(hw);
|
||||
|
||||
- if (local->assoc_led)
|
||||
- return local->assoc_led_name;
|
||||
- return NULL;
|
||||
+ return local->assoc_led_name;
|
||||
}
|
||||
EXPORT_SYMBOL(__ieee80211_get_assoc_led_name);
|
||||
|
||||
@@ -145,9 +157,7 @@ char *__ieee80211_get_tx_led_name(struct
|
||||
{
|
||||
struct ieee80211_local *local = hw_to_local(hw);
|
||||
|
||||
- if (local->tx_led)
|
||||
- return local->tx_led_name;
|
||||
- return NULL;
|
||||
+ return local->tx_led_name;
|
||||
}
|
||||
EXPORT_SYMBOL(__ieee80211_get_tx_led_name);
|
||||
|
||||
@@ -155,8 +165,115 @@ char *__ieee80211_get_rx_led_name(struct
|
||||
{
|
||||
struct ieee80211_local *local = hw_to_local(hw);
|
||||
|
||||
- if (local->rx_led)
|
||||
- return local->rx_led_name;
|
||||
- return NULL;
|
||||
+ return local->rx_led_name;
|
||||
}
|
||||
EXPORT_SYMBOL(__ieee80211_get_rx_led_name);
|
||||
+
|
||||
+static unsigned long tpt_trig_traffic(struct ieee80211_local *local,
|
||||
+ struct tpt_led_trigger *tpt_trig)
|
||||
+{
|
||||
+ unsigned long traffic, delta;
|
||||
+
|
||||
+ traffic = tpt_trig->tx_bytes + tpt_trig->rx_bytes;
|
||||
+
|
||||
+ delta = traffic - tpt_trig->prev_traffic;
|
||||
+ tpt_trig->prev_traffic = traffic;
|
||||
+ return DIV_ROUND_UP(delta, 1024 / 8);
|
||||
+}
|
||||
+
|
||||
+static void tpt_trig_timer(unsigned long data)
|
||||
+{
|
||||
+ struct ieee80211_local *local = (void *)data;
|
||||
+ struct tpt_led_trigger *tpt_trig = local->tpt_led_trigger;
|
||||
+ struct led_classdev *led_cdev;
|
||||
+ unsigned long on, off, tpt;
|
||||
+ int i;
|
||||
+
|
||||
+ if (!tpt_trig->running)
|
||||
+ return;
|
||||
+
|
||||
+ mod_timer(&tpt_trig->timer, round_jiffies(jiffies + HZ));
|
||||
+
|
||||
+ tpt = tpt_trig_traffic(local, tpt_trig);
|
||||
+
|
||||
+ /* default to just solid on */
|
||||
+ on = 1;
|
||||
+ off = 0;
|
||||
+
|
||||
+ for (i = tpt_trig->blink_table_len - 1; i >= 0; i--) {
|
||||
+ if (tpt_trig->blink_table[i].throughput < 0 ||
|
||||
+ tpt > tpt_trig->blink_table[i].throughput) {
|
||||
+ off = tpt_trig->blink_table[i].blink_time / 2;
|
||||
+ on = tpt_trig->blink_table[i].blink_time - off;
|
||||
+ break;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ read_lock(&tpt_trig->trig.leddev_list_lock);
|
||||
+ list_for_each_entry(led_cdev, &tpt_trig->trig.led_cdevs, trig_list)
|
||||
+ led_blink_set(led_cdev, &on, &off);
|
||||
+ read_unlock(&tpt_trig->trig.leddev_list_lock);
|
||||
+}
|
||||
+
|
||||
+extern char *__ieee80211_create_tpt_led_trigger(
|
||||
+ struct ieee80211_hw *hw,
|
||||
+ const struct ieee80211_tpt_blink *blink_table,
|
||||
+ unsigned int blink_table_len)
|
||||
+{
|
||||
+ struct ieee80211_local *local = hw_to_local(hw);
|
||||
+ struct tpt_led_trigger *tpt_trig;
|
||||
+
|
||||
+ if (WARN_ON(local->tpt_led_trigger))
|
||||
+ return NULL;
|
||||
+
|
||||
+ tpt_trig = kzalloc(sizeof(struct tpt_led_trigger), GFP_KERNEL);
|
||||
+ if (!tpt_trig)
|
||||
+ return NULL;
|
||||
+
|
||||
+ snprintf(tpt_trig->name, sizeof(tpt_trig->name),
|
||||
+ "%stpt", wiphy_name(local->hw.wiphy));
|
||||
+
|
||||
+ tpt_trig->trig.name = tpt_trig->name;
|
||||
+
|
||||
+ tpt_trig->blink_table = blink_table;
|
||||
+ tpt_trig->blink_table_len = blink_table_len;
|
||||
+
|
||||
+ setup_timer(&tpt_trig->timer, tpt_trig_timer, (unsigned long)local);
|
||||
+
|
||||
+ local->tpt_led_trigger = tpt_trig;
|
||||
+
|
||||
+ return tpt_trig->name;
|
||||
+}
|
||||
+EXPORT_SYMBOL(__ieee80211_create_tpt_led_trigger);
|
||||
+
|
||||
+void ieee80211_start_tpt_led_trig(struct ieee80211_local *local)
|
||||
+{
|
||||
+ struct tpt_led_trigger *tpt_trig = local->tpt_led_trigger;
|
||||
+
|
||||
+ if (!tpt_trig)
|
||||
+ return;
|
||||
+
|
||||
+ /* reset traffic */
|
||||
+ tpt_trig_traffic(local, tpt_trig);
|
||||
+ tpt_trig->running = true;
|
||||
+
|
||||
+ tpt_trig_timer((unsigned long)local);
|
||||
+ mod_timer(&tpt_trig->timer, round_jiffies(jiffies + HZ));
|
||||
+}
|
||||
+
|
||||
+void ieee80211_stop_tpt_led_trig(struct ieee80211_local *local)
|
||||
+{
|
||||
+ struct tpt_led_trigger *tpt_trig = local->tpt_led_trigger;
|
||||
+ struct led_classdev *led_cdev;
|
||||
+
|
||||
+ if (!tpt_trig)
|
||||
+ return;
|
||||
+
|
||||
+ tpt_trig->running = false;
|
||||
+ del_timer_sync(&tpt_trig->timer);
|
||||
+
|
||||
+ read_lock(&tpt_trig->trig.leddev_list_lock);
|
||||
+ list_for_each_entry(led_cdev, &tpt_trig->trig.led_cdevs, trig_list)
|
||||
+ led_brightness_set(led_cdev, LED_OFF);
|
||||
+ read_unlock(&tpt_trig->trig.leddev_list_lock);
|
||||
+}
|
||||
--- a/net/mac80211/led.h
|
||||
+++ b/net/mac80211/led.h
|
||||
@@ -12,14 +12,17 @@
|
||||
#include "ieee80211_i.h"
|
||||
|
||||
#ifdef CONFIG_MAC80211_LEDS
|
||||
-extern void ieee80211_led_rx(struct ieee80211_local *local);
|
||||
-extern void ieee80211_led_tx(struct ieee80211_local *local, int q);
|
||||
-extern void ieee80211_led_assoc(struct ieee80211_local *local,
|
||||
- bool associated);
|
||||
-extern void ieee80211_led_radio(struct ieee80211_local *local,
|
||||
- bool enabled);
|
||||
-extern void ieee80211_led_init(struct ieee80211_local *local);
|
||||
-extern void ieee80211_led_exit(struct ieee80211_local *local);
|
||||
+void ieee80211_led_rx(struct ieee80211_local *local);
|
||||
+void ieee80211_led_tx(struct ieee80211_local *local, int q);
|
||||
+void ieee80211_led_assoc(struct ieee80211_local *local,
|
||||
+ bool associated);
|
||||
+void ieee80211_led_radio(struct ieee80211_local *local,
|
||||
+ bool enabled);
|
||||
+void ieee80211_led_names(struct ieee80211_local *local);
|
||||
+void ieee80211_led_init(struct ieee80211_local *local);
|
||||
+void ieee80211_led_exit(struct ieee80211_local *local);
|
||||
+void ieee80211_start_tpt_led_trig(struct ieee80211_local *local);
|
||||
+void ieee80211_stop_tpt_led_trig(struct ieee80211_local *local);
|
||||
#else
|
||||
static inline void ieee80211_led_rx(struct ieee80211_local *local)
|
||||
{
|
||||
@@ -35,10 +38,37 @@ static inline void ieee80211_led_radio(s
|
||||
bool enabled)
|
||||
{
|
||||
}
|
||||
+static inline void ieee80211_led_names(struct ieee80211_local *local)
|
||||
+{
|
||||
+}
|
||||
static inline void ieee80211_led_init(struct ieee80211_local *local)
|
||||
{
|
||||
}
|
||||
static inline void ieee80211_led_exit(struct ieee80211_local *local)
|
||||
{
|
||||
}
|
||||
+static inline void ieee80211_start_tpt_led_trig(struct ieee80211_local *local)
|
||||
+{
|
||||
+}
|
||||
+static inline void ieee80211_stop_tpt_led_trig(struct ieee80211_local *local)
|
||||
+{
|
||||
+}
|
||||
+#endif
|
||||
+
|
||||
+static inline void
|
||||
+ieee80211_tpt_led_trig_tx(struct ieee80211_local *local, __le16 fc, int bytes)
|
||||
+{
|
||||
+#ifdef CONFIG_MAC80211_LEDS
|
||||
+ if (local->tpt_led_trigger && ieee80211_is_data(fc))
|
||||
+ local->tpt_led_trigger->tx_bytes += bytes;
|
||||
+#endif
|
||||
+}
|
||||
+
|
||||
+static inline void
|
||||
+ieee80211_tpt_led_trig_rx(struct ieee80211_local *local, __le16 fc, int bytes)
|
||||
+{
|
||||
+#ifdef CONFIG_MAC80211_LEDS
|
||||
+ if (local->tpt_led_trigger && ieee80211_is_data(fc))
|
||||
+ local->tpt_led_trigger->rx_bytes += bytes;
|
||||
#endif
|
||||
+}
|
||||
--- a/net/mac80211/main.c
|
||||
+++ b/net/mac80211/main.c
|
||||
@@ -602,6 +602,8 @@ struct ieee80211_hw *ieee80211_alloc_hw(
|
||||
/* init dummy netdev for use w/ NAPI */
|
||||
init_dummy_netdev(&local->napi_dev);
|
||||
|
||||
+ ieee80211_led_names(local);
|
||||
+
|
||||
return local_to_hw(local);
|
||||
}
|
||||
EXPORT_SYMBOL(ieee80211_alloc_hw);
|
||||
--- a/include/net/mac80211.h
|
||||
+++ b/include/net/mac80211.h
|
||||
@@ -1856,11 +1856,26 @@ struct ieee80211_hw *ieee80211_alloc_hw(
|
||||
*/
|
||||
int ieee80211_register_hw(struct ieee80211_hw *hw);
|
||||
|
||||
+/**
|
||||
+ * struct ieee80211_tpt_blink - throughput blink description
|
||||
+ * @throughput: throughput in Kbit/sec
|
||||
+ * @blink_time: blink time in milliseconds
|
||||
+ * (full cycle, ie. one off + one on period)
|
||||
+ */
|
||||
+struct ieee80211_tpt_blink {
|
||||
+ int throughput;
|
||||
+ int blink_time;
|
||||
+};
|
||||
+
|
||||
#ifdef CONFIG_MAC80211_LEDS
|
||||
extern char *__ieee80211_get_tx_led_name(struct ieee80211_hw *hw);
|
||||
extern char *__ieee80211_get_rx_led_name(struct ieee80211_hw *hw);
|
||||
extern char *__ieee80211_get_assoc_led_name(struct ieee80211_hw *hw);
|
||||
extern char *__ieee80211_get_radio_led_name(struct ieee80211_hw *hw);
|
||||
+extern char *__ieee80211_create_tpt_led_trigger(
|
||||
+ struct ieee80211_hw *hw,
|
||||
+ const struct ieee80211_tpt_blink *blink_table,
|
||||
+ unsigned int blink_table_len);
|
||||
#endif
|
||||
/**
|
||||
* ieee80211_get_tx_led_name - get name of TX LED
|
||||
@@ -1939,6 +1954,29 @@ static inline char *ieee80211_get_radio_
|
||||
}
|
||||
|
||||
/**
|
||||
+ * ieee80211_create_tpt_led_trigger - create throughput LED trigger
|
||||
+ * @hw: the hardware to create the trigger for
|
||||
+ * @blink_table: the blink table -- needs to be ordered by throughput
|
||||
+ * @blink_table_len: size of the blink table
|
||||
+ *
|
||||
+ * This function returns %NULL (in case of error, or if no LED
|
||||
+ * triggers are configured) or the name of the new trigger.
|
||||
+ * This function must be called before ieee80211_register_hw().
|
||||
+ */
|
||||
+static inline char *
|
||||
+ieee80211_create_tpt_led_trigger(struct ieee80211_hw *hw,
|
||||
+ const struct ieee80211_tpt_blink *blink_table,
|
||||
+ unsigned int blink_table_len)
|
||||
+{
|
||||
+#ifdef CONFIG_MAC80211_LEDS
|
||||
+ return __ieee80211_create_tpt_led_trigger(hw, blink_table,
|
||||
+ blink_table_len);
|
||||
+#else
|
||||
+ return NULL;
|
||||
+#endif
|
||||
+}
|
||||
+
|
||||
+/**
|
||||
* ieee80211_unregister_hw - Unregister a hardware device
|
||||
*
|
||||
* This function instructs mac80211 to free allocated resources
|
||||
--- a/net/mac80211/ieee80211_i.h
|
||||
+++ b/net/mac80211/ieee80211_i.h
|
||||
@@ -23,6 +23,7 @@
|
||||
#include <linux/types.h>
|
||||
#include <linux/spinlock.h>
|
||||
#include <linux/etherdevice.h>
|
||||
+#include <linux/leds.h>
|
||||
#include <net/ieee80211_radiotap.h>
|
||||
#include <net/cfg80211.h>
|
||||
#include <net/mac80211.h>
|
||||
@@ -629,6 +630,19 @@ enum queue_stop_reason {
|
||||
IEEE80211_QUEUE_STOP_REASON_SKB_ADD,
|
||||
};
|
||||
|
||||
+#ifdef CONFIG_MAC80211_LEDS
|
||||
+struct tpt_led_trigger {
|
||||
+ struct led_trigger trig;
|
||||
+ char name[32];
|
||||
+ const struct ieee80211_tpt_blink *blink_table;
|
||||
+ unsigned int blink_table_len;
|
||||
+ struct timer_list timer;
|
||||
+ bool running;
|
||||
+ unsigned long prev_traffic;
|
||||
+ unsigned long tx_bytes, rx_bytes;
|
||||
+};
|
||||
+#endif
|
||||
+
|
||||
/**
|
||||
* mac80211 scan flags - currently active scan mode
|
||||
*
|
||||
@@ -842,6 +856,7 @@ struct ieee80211_local {
|
||||
#ifdef CONFIG_MAC80211_LEDS
|
||||
int tx_led_counter, rx_led_counter;
|
||||
struct led_trigger *tx_led, *rx_led, *assoc_led, *radio_led;
|
||||
+ struct tpt_led_trigger *tpt_led_trigger;
|
||||
char tx_led_name[32], rx_led_name[32],
|
||||
assoc_led_name[32], radio_led_name[32];
|
||||
#endif
|
||||
--- a/net/mac80211/iface.c
|
||||
+++ b/net/mac80211/iface.c
|
||||
@@ -220,6 +220,7 @@ static int ieee80211_do_open(struct net_
|
||||
/* we're brought up, everything changes */
|
||||
hw_reconf_flags = ~0;
|
||||
ieee80211_led_radio(local, true);
|
||||
+ ieee80211_start_tpt_led_trig(local);
|
||||
}
|
||||
|
||||
/*
|
||||
--- a/net/mac80211/rx.c
|
||||
+++ b/net/mac80211/rx.c
|
||||
@@ -2888,6 +2888,9 @@ void ieee80211_rx(struct ieee80211_hw *h
|
||||
return;
|
||||
}
|
||||
|
||||
+ ieee80211_tpt_led_trig_rx(local,
|
||||
+ ((struct ieee80211_hdr *)skb->data)->frame_control,
|
||||
+ skb->len);
|
||||
__ieee80211_rx_handle_packet(hw, skb);
|
||||
|
||||
rcu_read_unlock();
|
||||
--- a/net/mac80211/tx.c
|
||||
+++ b/net/mac80211/tx.c
|
||||
@@ -1293,6 +1293,7 @@ static int __ieee80211_tx(struct ieee802
|
||||
|
||||
while (skb) {
|
||||
int q = skb_get_queue_mapping(skb);
|
||||
+ __le16 fc;
|
||||
|
||||
spin_lock_irqsave(&local->queue_stop_reason_lock, flags);
|
||||
ret = IEEE80211_TX_OK;
|
||||
@@ -1335,6 +1336,7 @@ static int __ieee80211_tx(struct ieee802
|
||||
else
|
||||
info->control.sta = NULL;
|
||||
|
||||
+ fc = ((struct ieee80211_hdr *)skb->data)->frame_control;
|
||||
ret = drv_tx(local, skb);
|
||||
if (WARN_ON(ret != NETDEV_TX_OK && skb->len != len)) {
|
||||
dev_kfree_skb(skb);
|
||||
@@ -1345,6 +1347,7 @@ static int __ieee80211_tx(struct ieee802
|
||||
return IEEE80211_TX_AGAIN;
|
||||
}
|
||||
|
||||
+ ieee80211_tpt_led_trig_tx(local, fc, len);
|
||||
*skbp = skb = next;
|
||||
ieee80211_led_tx(local, 1);
|
||||
fragm = true;
|
||||
--- a/net/mac80211/util.c
|
||||
+++ b/net/mac80211/util.c
|
||||
@@ -1141,6 +1141,7 @@ u32 ieee80211_sta_get_rates(struct ieee8
|
||||
void ieee80211_stop_device(struct ieee80211_local *local)
|
||||
{
|
||||
ieee80211_led_radio(local, false);
|
||||
+ ieee80211_stop_tpt_led_trig(local);
|
||||
|
||||
cancel_work_sync(&local->reconfig_filter);
|
||||
|
||||
@@ -1175,6 +1176,7 @@ int ieee80211_reconfig(struct ieee80211_
|
||||
}
|
||||
|
||||
ieee80211_led_radio(local, true);
|
||||
+ ieee80211_start_tpt_led_trig(local);
|
||||
}
|
||||
|
||||
/* add interfaces */
|
@ -1,725 +0,0 @@ |
||||
--- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
|
||||
+++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
|
||||
@@ -57,6 +57,8 @@
|
||||
#define SUB_NUM_CTL_MODES_AT_5G_40 2 /* excluding HT40, EXT-OFDM */
|
||||
#define SUB_NUM_CTL_MODES_AT_2G_40 3 /* excluding HT40, EXT-OFDM, EXT-CCK */
|
||||
|
||||
+#define CTL(_tpower, _flag) ((_tpower) | ((_flag) << 6))
|
||||
+
|
||||
static int ar9003_hw_power_interpolate(int32_t x,
|
||||
int32_t *px, int32_t *py, u_int16_t np);
|
||||
static const struct ar9300_eeprom ar9300_default = {
|
||||
@@ -296,21 +298,21 @@ static const struct ar9300_eeprom ar9300
|
||||
}
|
||||
},
|
||||
.ctlPowerData_2G = {
|
||||
- { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
|
||||
- { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
|
||||
- { { {60, 1}, {60, 0}, {60, 0}, {60, 1} } },
|
||||
-
|
||||
- { { {60, 1}, {60, 0}, {0, 0}, {0, 0} } },
|
||||
- { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
|
||||
- { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
|
||||
-
|
||||
- { { {60, 0}, {60, 1}, {60, 1}, {60, 0} } },
|
||||
- { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
|
||||
- { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
|
||||
-
|
||||
- { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
|
||||
- { { {60, 0}, {60, 1}, {60, 1}, {60, 1} } },
|
||||
- { { {60, 0}, {60, 1}, {60, 1}, {60, 1} } },
|
||||
+ { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },
|
||||
+ { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },
|
||||
+ { { CTL(60, 1), CTL(60, 0), CTL(60, 0), CTL(60, 1) } },
|
||||
+
|
||||
+ { { CTL(60, 1), CTL(60, 0), CTL(0, 0), CTL(0, 0) } },
|
||||
+ { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },
|
||||
+ { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },
|
||||
+
|
||||
+ { { CTL(60, 0), CTL(60, 1), CTL(60, 1), CTL(60, 0) } },
|
||||
+ { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },
|
||||
+ { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },
|
||||
+
|
||||
+ { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },
|
||||
+ { { CTL(60, 0), CTL(60, 1), CTL(60, 1), CTL(60, 1) } },
|
||||
+ { { CTL(60, 0), CTL(60, 1), CTL(60, 1), CTL(60, 1) } },
|
||||
},
|
||||
.modalHeader5G = {
|
||||
/* 4 idle,t1,t2,b (4 bits per setting) */
|
||||
@@ -582,56 +584,56 @@ static const struct ar9300_eeprom ar9300
|
||||
.ctlPowerData_5G = {
|
||||
{
|
||||
{
|
||||
- {60, 1}, {60, 1}, {60, 1}, {60, 1},
|
||||
- {60, 1}, {60, 1}, {60, 1}, {60, 0},
|
||||
+ CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 1),
|
||||
+ CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 0),
|
||||
}
|
||||
},
|
||||
{
|
||||
{
|
||||
- {60, 1}, {60, 1}, {60, 1}, {60, 1},
|
||||
- {60, 1}, {60, 1}, {60, 1}, {60, 0},
|
||||
+ CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 1),
|
||||
+ CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 0),
|
||||
}
|
||||
},
|
||||
{
|
||||
{
|
||||
- {60, 0}, {60, 1}, {60, 0}, {60, 1},
|
||||
- {60, 1}, {60, 1}, {60, 1}, {60, 1},
|
||||
+ CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 1),
|
||||
+ CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 1),
|
||||
}
|
||||
},
|
||||
{
|
||||
{
|
||||
- {60, 0}, {60, 1}, {60, 1}, {60, 0},
|
||||
- {60, 1}, {60, 0}, {60, 0}, {60, 0},
|
||||
+ CTL(60, 0), CTL(60, 1), CTL(60, 1), CTL(60, 0),
|
||||
+ CTL(60, 1), CTL(60, 0), CTL(60, 0), CTL(60, 0),
|
||||
}
|
||||
},
|
||||
{
|
||||
{
|
||||
- {60, 1}, {60, 1}, {60, 1}, {60, 0},
|
||||
- {60, 0}, {60, 0}, {60, 0}, {60, 0},
|
||||
+ CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 0),
|
||||
+ CTL(60, 0), CTL(60, 0), CTL(60, 0), CTL(60, 0),
|
||||
}
|
||||
},
|
||||
{
|
||||
{
|
||||
- {60, 1}, {60, 1}, {60, 1}, {60, 1},
|
||||
- {60, 1}, {60, 0}, {60, 0}, {60, 0},
|
||||
+ CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 1),
|
||||
+ CTL(60, 1), CTL(60, 0), CTL(60, 0), CTL(60, 0),
|
||||
}
|
||||
},
|
||||
{
|
||||
{
|
||||
- {60, 1}, {60, 1}, {60, 1}, {60, 1},
|
||||
- {60, 1}, {60, 1}, {60, 1}, {60, 1},
|
||||
+ CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 1),
|
||||
+ CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 1),
|
||||
}
|
||||
},
|
||||
{
|
||||
{
|
||||
- {60, 1}, {60, 1}, {60, 0}, {60, 1},
|
||||
- {60, 1}, {60, 1}, {60, 1}, {60, 0},
|
||||
+ CTL(60, 1), CTL(60, 1), CTL(60, 0), CTL(60, 1),
|
||||
+ CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 0),
|
||||
}
|
||||
},
|
||||
{
|
||||
{
|
||||
- {60, 1}, {60, 0}, {60, 1}, {60, 1},
|
||||
- {60, 1}, {60, 1}, {60, 0}, {60, 1},
|
||||
+ CTL(60, 1), CTL(60, 0), CTL(60, 1), CTL(60, 1),
|
||||
+ CTL(60, 1), CTL(60, 1), CTL(60, 0), CTL(60, 1),
|
||||
}
|
||||
},
|
||||
}
|
||||
@@ -873,21 +875,21 @@ static const struct ar9300_eeprom ar9300
|
||||
}
|
||||
},
|
||||
.ctlPowerData_2G = {
|
||||
- { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
|
||||
- { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
|
||||
- { { {60, 1}, {60, 0}, {60, 0}, {60, 1} } },
|
||||
-
|
||||
- { { {60, 1}, {60, 0}, {0, 0}, {0, 0} } },
|
||||
- { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
|
||||
- { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
|
||||
-
|
||||
- { { {60, 0}, {60, 1}, {60, 1}, {60, 0} } },
|
||||
- { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
|
||||
- { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
|
||||
-
|
||||
- { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
|
||||
- { { {60, 0}, {60, 1}, {60, 1}, {60, 1} } },
|
||||
- { { {60, 0}, {60, 1}, {60, 1}, {60, 1} } },
|
||||
+ { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },
|
||||
+ { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },
|
||||
+ { { CTL(60, 1), CTL(60, 0), CTL(60, 0), CTL(60, 1) } },
|
||||
+
|
||||
+ { { CTL(60, 1), CTL(60, 0), CTL(0, 0), CTL(0, 0) } },
|
||||
+ { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },
|
||||
+ { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },
|
||||
+
|
||||
+ { { CTL(60, 0), CTL(60, 1), CTL(60, 1), CTL(60, 0) } },
|
||||
+ { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },
|
||||
+ { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },
|
||||
+
|
||||
+ { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },
|
||||
+ { { CTL(60, 0), CTL(60, 1), CTL(60, 1), CTL(60, 1) } },
|
||||
+ { { CTL(60, 0), CTL(60, 1), CTL(60, 1), CTL(60, 1) } },
|
||||
},
|
||||
.modalHeader5G = {
|
||||
/* 4 idle,t1,t2,b (4 bits per setting) */
|
||||
@@ -1159,56 +1161,56 @@ static const struct ar9300_eeprom ar9300
|
||||
.ctlPowerData_5G = {
|
||||
{
|
||||
{
|
||||
- {60, 1}, {60, 1}, {60, 1}, {60, 1},
|
||||
- {60, 1}, {60, 1}, {60, 1}, {60, 0},
|
||||
+ CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 1),
|
||||
+ CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 0),
|
||||
}
|
||||
},
|
||||
{
|
||||
{
|
||||
- {60, 1}, {60, 1}, {60, 1}, {60, 1},
|
||||
- {60, 1}, {60, 1}, {60, 1}, {60, 0},
|
||||
+ CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 1),
|
||||
+ CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 0),
|
||||
}
|
||||
},
|
||||
{
|
||||
{
|
||||
- {60, 0}, {60, 1}, {60, 0}, {60, 1},
|
||||
- {60, 1}, {60, 1}, {60, 1}, {60, 1},
|
||||
+ CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 1),
|
||||
+ CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 1),
|
||||
}
|
||||
},
|
||||
{
|
||||
{
|
||||
- {60, 0}, {60, 1}, {60, 1}, {60, 0},
|
||||
- {60, 1}, {60, 0}, {60, 0}, {60, 0},
|
||||
+ CTL(60, 0), CTL(60, 1), CTL(60, 1), CTL(60, 0),
|
||||
+ CTL(60, 1), CTL(60, 0), CTL(60, 0), CTL(60, 0),
|
||||
}
|
||||
},
|
||||
{
|
||||
{
|
||||
- {60, 1}, {60, 1}, {60, 1}, {60, 0},
|
||||
- {60, 0}, {60, 0}, {60, 0}, {60, 0},
|
||||
+ CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 0),
|
||||
+ CTL(60, 0), CTL(60, 0), CTL(60, 0), CTL(60, 0),
|
||||
}
|
||||
},
|
||||
{
|
||||
{
|
||||
- {60, 1}, {60, 1}, {60, 1}, {60, 1},
|
||||
- {60, 1}, {60, 0}, {60, 0}, {60, 0},
|
||||
+ CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 1),
|
||||
+ CTL(60, 1), CTL(60, 0), CTL(60, 0), CTL(60, 0),
|
||||
}
|
||||
},
|
||||
{
|
||||
{
|
||||
- {60, 1}, {60, 1}, {60, 1}, {60, 1},
|
||||
- {60, 1}, {60, 1}, {60, 1}, {60, 1},
|
||||
+ CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 1),
|
||||
+ CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 1),
|
||||
}
|
||||
},
|
||||
{
|
||||
{
|
||||
- {60, 1}, {60, 1}, {60, 0}, {60, 1},
|
||||
- {60, 1}, {60, 1}, {60, 1}, {60, 0},
|
||||
+ CTL(60, 1), CTL(60, 1), CTL(60, 0), CTL(60, 1),
|
||||
+ CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 0),
|
||||
}
|
||||
},
|
||||
{
|
||||
{
|
||||
- {60, 1}, {60, 0}, {60, 1}, {60, 1},
|
||||
- {60, 1}, {60, 1}, {60, 0}, {60, 1},
|
||||
+ CTL(60, 1), CTL(60, 0), CTL(60, 1), CTL(60, 1),
|
||||
+ CTL(60, 1), CTL(60, 1), CTL(60, 0), CTL(60, 1),
|
||||
}
|
||||
},
|
||||
}
|
||||
@@ -1451,21 +1453,21 @@ static const struct ar9300_eeprom ar9300
|
||||
}
|
||||
},
|
||||
.ctlPowerData_2G = {
|
||||
- { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
|
||||
- { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
|
||||
- { { {60, 1}, {60, 0}, {60, 0}, {60, 1} } },
|
||||
-
|
||||
- { { {60, 1}, {60, 0}, {0, 0}, {0, 0} } },
|
||||
- { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
|
||||
- { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
|
||||
-
|
||||
- { { {60, 0}, {60, 1}, {60, 1}, {60, 0} } },
|
||||
- { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
|
||||
- { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
|
||||
-
|
||||
- { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
|
||||
- { { {60, 0}, {60, 1}, {60, 1}, {60, 1} } },
|
||||
- { { {60, 0}, {60, 1}, {60, 1}, {60, 1} } },
|
||||
+ { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },
|
||||
+ { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },
|
||||
+ { { CTL(60, 1), CTL(60, 0), CTL(60, 0), CTL(60, 1) } },
|
||||
+
|
||||
+ { { CTL(60, 1), CTL(60, 0), CTL(0, 0), CTL(0, 0) } },
|
||||
+ { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },
|
||||
+ { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },
|
||||
+
|
||||
+ { { CTL(60, 0), CTL(60, 1), CTL(60, 1), CTL(60, 0) } },
|
||||
+ { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },
|
||||
+ { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },
|
||||
+
|
||||
+ { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },
|
||||
+ { { CTL(60, 0), CTL(60, 1), CTL(60, 1), CTL(60, 1) } },
|
||||
+ { { CTL(60, 0), CTL(60, 1), CTL(60, 1), CTL(60, 1) } },
|
||||
},
|
||||
.modalHeader5G = {
|
||||
/* 4 idle,t1,t2,b (4 bits per setting) */
|
||||
@@ -1737,56 +1739,56 @@ static const struct ar9300_eeprom ar9300
|
||||
.ctlPowerData_5G = {
|
||||
{
|
||||
{
|
||||
- {60, 1}, {60, 1}, {60, 1}, {60, 1},
|
||||
- {60, 1}, {60, 1}, {60, 1}, {60, 0},
|
||||
+ CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 1),
|
||||
+ CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 0),
|
||||
}
|
||||
},
|
||||
{
|
||||
{
|
||||
- {60, 1}, {60, 1}, {60, 1}, {60, 1},
|
||||
- {60, 1}, {60, 1}, {60, 1}, {60, 0},
|
||||
+ CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 1),
|
||||
+ CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 0),
|
||||
}
|
||||
},
|
||||
{
|
||||
{
|
||||
- {60, 0}, {60, 1}, {60, 0}, {60, 1},
|
||||
- {60, 1}, {60, 1}, {60, 1}, {60, 1},
|
||||
+ CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 1),
|
||||
+ CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 1),
|
||||
}
|
||||
},
|
||||
{
|
||||
{
|
||||
- {60, 0}, {60, 1}, {60, 1}, {60, 0},
|
||||
- {60, 1}, {60, 0}, {60, 0}, {60, 0},
|
||||
+ CTL(60, 0), CTL(60, 1), CTL(60, 1), CTL(60, 0),
|
||||
+ CTL(60, 1), CTL(60, 0), CTL(60, 0), CTL(60, 0),
|
||||
}
|
||||
},
|
||||
{
|
||||
{
|
||||
- {60, 1}, {60, 1}, {60, 1}, {60, 0},
|
||||
- {60, 0}, {60, 0}, {60, 0}, {60, 0},
|
||||
+ CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 0),
|
||||
+ CTL(60, 0), CTL(60, 0), CTL(60, 0), CTL(60, 0),
|
||||
}
|
||||
},
|
||||
{
|
||||
{
|
||||
- {60, 1}, {60, 1}, {60, 1}, {60, 1},
|
||||
- {60, 1}, {60, 0}, {60, 0}, {60, 0},
|
||||
+ CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 1),
|
||||
+ CTL(60, 1), CTL(60, 0), CTL(60, 0), CTL(60, 0),
|
||||
}
|
||||
},
|
||||
{
|
||||
{
|
||||
- {60, 1}, {60, 1}, {60, 1}, {60, 1},
|
||||
- {60, 1}, {60, 1}, {60, 1}, {60, 1},
|
||||
+ CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 1),
|
||||
+ CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 1),
|
||||
}
|
||||
},
|
||||
{
|
||||
{
|
||||
- {60, 1}, {60, 1}, {60, 0}, {60, 1},
|
||||
- {60, 1}, {60, 1}, {60, 1}, {60, 0},
|
||||
+ CTL(60, 1), CTL(60, 1), CTL(60, 0), CTL(60, 1),
|
||||
+ CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 0),
|
||||
}
|
||||
},
|
||||
{
|
||||
{
|
||||
- {60, 1}, {60, 0}, {60, 1}, {60, 1},
|
||||
- {60, 1}, {60, 1}, {60, 0}, {60, 1},
|
||||
+ CTL(60, 1), CTL(60, 0), CTL(60, 1), CTL(60, 1),
|
||||
+ CTL(60, 1), CTL(60, 1), CTL(60, 0), CTL(60, 1),
|
||||
}
|
||||
},
|
||||
}
|
||||
@@ -2029,21 +2031,21 @@ static const struct ar9300_eeprom ar9300
|
||||
}
|
||||
},
|
||||
.ctlPowerData_2G = {
|
||||
- { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
|
||||
- { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
|
||||
- { { {60, 1}, {60, 0}, {60, 0}, {60, 1} } },
|
||||
-
|
||||
- { { {60, 1}, {60, 0}, {0, 0}, {0, 0} } },
|
||||
- { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
|
||||
- { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
|
||||
-
|
||||
- { { {60, 0}, {60, 1}, {60, 1}, {60, 0} } },
|
||||
- { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
|
||||
- { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
|
||||
-
|
||||
- { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
|
||||
- { { {60, 0}, {60, 1}, {60, 1}, {60, 1} } },
|
||||
- { { {60, 0}, {60, 1}, {60, 1}, {60, 1} } },
|
||||
+ { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },
|
||||
+ { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },
|
||||
+ { { CTL(60, 1), CTL(60, 0), CTL(60, 0), CTL(60, 1) } },
|
||||
+
|
||||
+ { { CTL(60, 1), CTL(60, 0), CTL(0, 0), CTL(0, 0) } },
|
||||
+ { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },
|
||||
+ { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },
|
||||
+
|
||||
+ { { CTL(60, 0), CTL(60, 1), CTL(60, 1), CTL(60, 0) } },
|
||||
+ { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },
|
||||
+ { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },
|
||||
+
|
||||
+ { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },
|
||||
+ { { CTL(60, 0), CTL(60, 1), CTL(60, 1), CTL(60, 1) } },
|
||||
+ { { CTL(60, 0), CTL(60, 1), CTL(60, 1), CTL(60, 1) } },
|
||||
},
|
||||
.modalHeader5G = {
|
||||
/* 4 idle,t1,t2,b (4 bits per setting) */
|
||||
@@ -2315,56 +2317,56 @@ static const struct ar9300_eeprom ar9300
|
||||
.ctlPowerData_5G = {
|
||||
{
|
||||
{
|
||||
- {60, 1}, {60, 1}, {60, 1}, {60, 1},
|
||||
- {60, 1}, {60, 1}, {60, 1}, {60, 0},
|
||||
+ CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 1),
|
||||
+ CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 0),
|
||||
}
|
||||
},
|
||||
{
|
||||
{
|
||||
- {60, 1}, {60, 1}, {60, 1}, {60, 1},
|
||||
- {60, 1}, {60, 1}, {60, 1}, {60, 0},
|
||||
+ CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 1),
|
||||
+ CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 0),
|
||||
}
|
||||
},
|
||||
{
|
||||
{
|
||||
- {60, 0}, {60, 1}, {60, 0}, {60, 1},
|
||||
- {60, 1}, {60, 1}, {60, 1}, {60, 1},
|
||||
+ CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 1),
|
||||
+ CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 1),
|
||||
}
|
||||
},
|
||||
{
|
||||
{
|
||||
- {60, 0}, {60, 1}, {60, 1}, {60, 0},
|
||||
- {60, 1}, {60, 0}, {60, 0}, {60, 0},
|
||||
+ CTL(60, 0), CTL(60, 1), CTL(60, 1), CTL(60, 0),
|
||||
+ CTL(60, 1), CTL(60, 0), CTL(60, 0), CTL(60, 0),
|
||||
}
|
||||
},
|
||||
{
|
||||
{
|
||||
- {60, 1}, {60, 1}, {60, 1}, {60, 0},
|
||||
- {60, 0}, {60, 0}, {60, 0}, {60, 0},
|
||||
+ CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 0),
|
||||
+ CTL(60, 0), CTL(60, 0), CTL(60, 0), CTL(60, 0),
|
||||
}
|
||||
},
|
||||
{
|
||||
{
|
||||
- {60, 1}, {60, 1}, {60, 1}, {60, 1},
|
||||
- {60, 1}, {60, 0}, {60, 0}, {60, 0},
|
||||
+ CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 1),
|
||||
+ CTL(60, 1), CTL(60, 0), CTL(60, 0), CTL(60, 0),
|
||||
}
|
||||
},
|
||||
{
|
||||
{
|
||||
- {60, 1}, {60, 1}, {60, 1}, {60, 1},
|
||||
- {60, 1}, {60, 1}, {60, 1}, {60, 1},
|
||||
+ CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 1),
|
||||
+ CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 1),
|
||||
}
|
||||
},
|
||||
{
|
||||
{
|
||||
- {60, 1}, {60, 1}, {60, 0}, {60, 1},
|
||||
- {60, 1}, {60, 1}, {60, 1}, {60, 0},
|
||||
+ CTL(60, 1), CTL(60, 1), CTL(60, 0), CTL(60, 1),
|
||||
+ CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 0),
|
||||
}
|
||||
},
|
||||
{
|
||||
{
|
||||
- {60, 1}, {60, 0}, {60, 1}, {60, 1},
|
||||
- {60, 1}, {60, 1}, {60, 0}, {60, 1},
|
||||
+ CTL(60, 1), CTL(60, 0), CTL(60, 1), CTL(60, 1),
|
||||
+ CTL(60, 1), CTL(60, 1), CTL(60, 0), CTL(60, 1),
|
||||
}
|
||||
},
|
||||
}
|
||||
@@ -2606,21 +2608,21 @@ static const struct ar9300_eeprom ar9300
|
||||
}
|
||||
},
|
||||
.ctlPowerData_2G = {
|
||||
- { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
|
||||
- { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
|
||||
- { { {60, 1}, {60, 0}, {60, 0}, {60, 1} } },
|
||||
-
|
||||
- { { {60, 1}, {60, 0}, {0, 0}, {0, 0} } },
|
||||
- { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
|
||||
- { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
|
||||
-
|
||||
- { { {60, 0}, {60, 1}, {60, 1}, {60, 0} } },
|
||||
- { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
|
||||
- { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
|
||||
-
|
||||
- { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
|
||||
- { { {60, 0}, {60, 1}, {60, 1}, {60, 1} } },
|
||||
- { { {60, 0}, {60, 1}, {60, 1}, {60, 1} } },
|
||||
+ { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },
|
||||
+ { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },
|
||||
+ { { CTL(60, 1), CTL(60, 0), CTL(60, 0), CTL(60, 1) } },
|
||||
+
|
||||
+ { { CTL(60, 1), CTL(60, 0), CTL(0, 0), CTL(0, 0) } },
|
||||
+ { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },
|
||||
+ { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },
|
||||
+
|
||||
+ { { CTL(60, 0), CTL(60, 1), CTL(60, 1), CTL(60, 0) } },
|
||||
+ { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },
|
||||
+ { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },
|
||||
+
|
||||
+ { { CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 0) } },
|
||||
+ { { CTL(60, 0), CTL(60, 1), CTL(60, 1), CTL(60, 1) } },
|
||||
+ { { CTL(60, 0), CTL(60, 1), CTL(60, 1), CTL(60, 1) } },
|
||||
},
|
||||
.modalHeader5G = {
|
||||
/* 4 idle,t1,t2,b (4 bits per setting) */
|
||||
@@ -2892,56 +2894,56 @@ static const struct ar9300_eeprom ar9300
|
||||
.ctlPowerData_5G = {
|
||||
{
|
||||
{
|
||||
- {60, 1}, {60, 1}, {60, 1}, {60, 1},
|
||||
- {60, 1}, {60, 1}, {60, 1}, {60, 0},
|
||||
+ CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 1),
|
||||
+ CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 0),
|
||||
}
|
||||
},
|
||||
{
|
||||
{
|
||||
- {60, 1}, {60, 1}, {60, 1}, {60, 1},
|
||||
- {60, 1}, {60, 1}, {60, 1}, {60, 0},
|
||||
+ CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 1),
|
||||
+ CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 0),
|
||||
}
|
||||
},
|
||||
{
|
||||
{
|
||||
- {60, 0}, {60, 1}, {60, 0}, {60, 1},
|
||||
- {60, 1}, {60, 1}, {60, 1}, {60, 1},
|
||||
+ CTL(60, 0), CTL(60, 1), CTL(60, 0), CTL(60, 1),
|
||||
+ CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 1),
|
||||
}
|
||||
},
|
||||
{
|
||||
{
|
||||
- {60, 0}, {60, 1}, {60, 1}, {60, 0},
|
||||
- {60, 1}, {60, 0}, {60, 0}, {60, 0},
|
||||
+ CTL(60, 0), CTL(60, 1), CTL(60, 1), CTL(60, 0),
|
||||
+ CTL(60, 1), CTL(60, 0), CTL(60, 0), CTL(60, 0),
|
||||
}
|
||||
},
|
||||
{
|
||||
{
|
||||
- {60, 1}, {60, 1}, {60, 1}, {60, 0},
|
||||
- {60, 0}, {60, 0}, {60, 0}, {60, 0},
|
||||
+ CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 0),
|
||||
+ CTL(60, 0), CTL(60, 0), CTL(60, 0), CTL(60, 0),
|
||||
}
|
||||
},
|
||||
{
|
||||
{
|
||||
- {60, 1}, {60, 1}, {60, 1}, {60, 1},
|
||||
- {60, 1}, {60, 0}, {60, 0}, {60, 0},
|
||||
+ CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 1),
|
||||
+ CTL(60, 1), CTL(60, 0), CTL(60, 0), CTL(60, 0),
|
||||
}
|
||||
},
|
||||
{
|
||||
{
|
||||
- {60, 1}, {60, 1}, {60, 1}, {60, 1},
|
||||
- {60, 1}, {60, 1}, {60, 1}, {60, 1},
|
||||
+ CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 1),
|
||||
+ CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 1),
|
||||
}
|
||||
},
|
||||
{
|
||||
{
|
||||
- {60, 1}, {60, 1}, {60, 0}, {60, 1},
|
||||
- {60, 1}, {60, 1}, {60, 1}, {60, 0},
|
||||
+ CTL(60, 1), CTL(60, 1), CTL(60, 0), CTL(60, 1),
|
||||
+ CTL(60, 1), CTL(60, 1), CTL(60, 1), CTL(60, 0),
|
||||
}
|
||||
},
|
||||
{
|
||||
{
|
||||
- {60, 1}, {60, 0}, {60, 1}, {60, 1},
|
||||
- {60, 1}, {60, 1}, {60, 0}, {60, 1},
|
||||
+ CTL(60, 1), CTL(60, 0), CTL(60, 1), CTL(60, 1),
|
||||
+ CTL(60, 1), CTL(60, 1), CTL(60, 0), CTL(60, 1),
|
||||
}
|
||||
},
|
||||
}
|
||||
@@ -4365,9 +4367,9 @@ static u16 ar9003_hw_get_direct_edge_pow
|
||||
struct cal_ctl_data_5g *ctl_5g = eep->ctlPowerData_5G;
|
||||
|
||||
if (is2GHz)
|
||||
- return ctl_2g[idx].ctlEdges[edge].tPower;
|
||||
+ return CTL_EDGE_TPOWER(ctl_2g[idx].ctlEdges[edge]);
|
||||
else
|
||||
- return ctl_5g[idx].ctlEdges[edge].tPower;
|
||||
+ return CTL_EDGE_TPOWER(ctl_5g[idx].ctlEdges[edge]);
|
||||
}
|
||||
|
||||
static u16 ar9003_hw_get_indirect_edge_power(struct ar9300_eeprom *eep,
|
||||
@@ -4385,12 +4387,12 @@ static u16 ar9003_hw_get_indirect_edge_p
|
||||
|
||||
if (is2GHz) {
|
||||
if (ath9k_hw_fbin2freq(ctl_freqbin[edge - 1], 1) < freq &&
|
||||
- ctl_2g[idx].ctlEdges[edge - 1].flag)
|
||||
- return ctl_2g[idx].ctlEdges[edge - 1].tPower;
|
||||
+ CTL_EDGE_FLAGS(ctl_2g[idx].ctlEdges[edge - 1]))
|
||||
+ return CTL_EDGE_TPOWER(ctl_2g[idx].ctlEdges[edge - 1]);
|
||||
} else {
|
||||
if (ath9k_hw_fbin2freq(ctl_freqbin[edge - 1], 0) < freq &&
|
||||
- ctl_5g[idx].ctlEdges[edge - 1].flag)
|
||||
- return ctl_5g[idx].ctlEdges[edge - 1].tPower;
|
||||
+ CTL_EDGE_FLAGS(ctl_5g[idx].ctlEdges[edge - 1]))
|
||||
+ return CTL_EDGE_TPOWER(ctl_5g[idx].ctlEdges[edge - 1]);
|
||||
}
|
||||
|
||||
return AR9300_MAX_RATE_POWER;
|
||||
--- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h
|
||||
+++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h
|
||||
@@ -270,17 +270,12 @@ struct cal_tgt_pow_ht {
|
||||
u8 tPow2x[14];
|
||||
} __packed;
|
||||
|
||||
-struct cal_ctl_edge_pwr {
|
||||
- u8 tPower:6,
|
||||
- flag:2;
|
||||
-} __packed;
|
||||
-
|
||||
struct cal_ctl_data_2g {
|
||||
- struct cal_ctl_edge_pwr ctlEdges[AR9300_NUM_BAND_EDGES_2G];
|
||||
+ u8 ctlEdges[AR9300_NUM_BAND_EDGES_2G];
|
||||
} __packed;
|
||||
|
||||
struct cal_ctl_data_5g {
|
||||
- struct cal_ctl_edge_pwr ctlEdges[AR9300_NUM_BAND_EDGES_5G];
|
||||
+ u8 ctlEdges[AR9300_NUM_BAND_EDGES_5G];
|
||||
} __packed;
|
||||
|
||||
struct ar9300_BaseExtension_1 {
|
||||
--- a/drivers/net/wireless/ath/ath9k/eeprom.c
|
||||
+++ b/drivers/net/wireless/ath/ath9k/eeprom.c
|
||||
@@ -240,16 +240,16 @@ u16 ath9k_hw_get_max_edge_power(u16 freq
|
||||
for (i = 0; (i < num_band_edges) &&
|
||||
(pRdEdgesPower[i].bChannel != AR5416_BCHAN_UNUSED); i++) {
|
||||
if (freq == ath9k_hw_fbin2freq(pRdEdgesPower[i].bChannel, is2GHz)) {
|
||||
- twiceMaxEdgePower = pRdEdgesPower[i].tPower;
|
||||
+ twiceMaxEdgePower = CTL_EDGE_TPOWER(pRdEdgesPower[i].ctl);
|
||||
break;
|
||||
} else if ((i > 0) &&
|
||||
(freq < ath9k_hw_fbin2freq(pRdEdgesPower[i].bChannel,
|
||||
is2GHz))) {
|
||||
if (ath9k_hw_fbin2freq(pRdEdgesPower[i - 1].bChannel,
|
||||
is2GHz) < freq &&
|
||||
- pRdEdgesPower[i - 1].flag) {
|
||||
+ CTL_EDGE_FLAGS(pRdEdgesPower[i - 1].ctl)) {
|
||||
twiceMaxEdgePower =
|
||||
- pRdEdgesPower[i - 1].tPower;
|
||||
+ CTL_EDGE_TPOWER(pRdEdgesPower[i - 1].ctl);
|
||||
}
|
||||
break;
|
||||
}
|
||||
--- a/drivers/net/wireless/ath/ath9k/eeprom.h
|
||||
+++ b/drivers/net/wireless/ath/ath9k/eeprom.h
|
||||
@@ -233,6 +233,18 @@
|
||||
|
||||
#define AR9287_CHECKSUM_LOCATION (AR9287_EEP_START_LOC + 1)
|
||||
|
||||
+#define CTL_EDGE_TPOWER(_ctl) ((_ctl) & 0x3f)
|
||||
+#define CTL_EDGE_FLAGS(_ctl) (((_ctl) >> 6) & 0x03)
|
||||
+
|
||||
+#define LNA_CTL_BUF_MODE BIT(0)
|
||||
+#define LNA_CTL_ISEL_LO BIT(1)
|
||||
+#define LNA_CTL_ISEL_HI BIT(2)
|
||||
+#define LNA_CTL_BUF_IN BIT(3)
|
||||
+#define LNA_CTL_FEM_BAND BIT(4)
|
||||
+#define LNA_CTL_LOCAL_BIAS BIT(5)
|
||||
+#define LNA_CTL_FORCE_XPA BIT(6)
|
||||
+#define LNA_CTL_USE_ANT1 BIT(7)
|
||||
+
|
||||
enum eeprom_param {
|
||||
EEP_NFTHRESH_5,
|
||||
EEP_NFTHRESH_2,
|
||||
@@ -379,10 +391,7 @@ struct modal_eep_header {
|
||||
u8 xatten2Margin[AR5416_MAX_CHAINS];
|
||||
u8 ob_ch1;
|
||||
u8 db_ch1;
|
||||
- u8 useAnt1:1,
|
||||
- force_xpaon:1,
|
||||
- local_bias:1,
|
||||
- femBandSelectUsed:1, xlnabufin:1, xlnaisel:2, xlnabufmode:1;
|
||||
+ u8 lna_ctl;
|
||||
u8 miscBits;
|
||||
u16 xpaBiasLvlFreq[3];
|
||||
u8 futureModal[6];
|
||||
@@ -536,18 +545,10 @@ struct cal_target_power_ht {
|
||||
u8 tPow2x[8];
|
||||
} __packed;
|
||||
|
||||
-
|
||||
-#ifdef __BIG_ENDIAN_BITFIELD
|
||||
struct cal_ctl_edges {
|
||||
u8 bChannel;
|
||||
- u8 flag:2, tPower:6;
|
||||
+ u8 ctl;
|
||||
} __packed;
|
||||
-#else
|
||||
-struct cal_ctl_edges {
|
||||
- u8 bChannel;
|
||||
- u8 tPower:6, flag:2;
|
||||
-} __packed;
|
||||
-#endif
|
||||
|
||||
struct cal_data_op_loop_ar9287 {
|
||||
u8 pwrPdg[2][5];
|
||||
--- a/drivers/net/wireless/ath/ath9k/eeprom_def.c
|
||||
+++ b/drivers/net/wireless/ath/ath9k/eeprom_def.c
|
||||
@@ -451,9 +451,10 @@ static void ath9k_hw_def_set_board_value
|
||||
ath9k_hw_analog_shift_rmw(ah, AR_AN_TOP2,
|
||||
AR_AN_TOP2_LOCALBIAS,
|
||||
AR_AN_TOP2_LOCALBIAS_S,
|
||||
- pModal->local_bias);
|
||||
+ !!(pModal->lna_ctl &
|
||||
+ LNA_CTL_LOCAL_BIAS));
|
||||
REG_RMW_FIELD(ah, AR_PHY_XPA_CFG, AR_PHY_FORCE_XPA_CFG,
|
||||
- pModal->force_xpaon);
|
||||
+ !!(pModal->lna_ctl & LNA_CTL_FORCE_XPA));
|
||||
}
|
||||
|
||||
REG_RMW_FIELD(ah, AR_PHY_SETTLING, AR_PHY_SETTLING_SWITCH,
|
||||
@@ -1435,9 +1436,9 @@ static u8 ath9k_hw_def_get_num_ant_confi
|
||||
|
||||
num_ant_config = 1;
|
||||
|
||||
- if (pBase->version >= 0x0E0D)
|
||||
- if (pModal->useAnt1)
|
||||
- num_ant_config += 1;
|
||||
+ if (pBase->version >= 0x0E0D &&
|
||||
+ (pModal->lna_ctl & LNA_CTL_USE_ANT1))
|
||||
+ num_ant_config += 1;
|
||||
|
||||
return num_ant_config;
|
||||
}
|
File diff suppressed because it is too large
Load Diff
@ -1,18 +0,0 @@ |
||||
--- a/net/mac80211/ieee80211_i.h
|
||||
+++ b/net/mac80211/ieee80211_i.h
|
||||
@@ -642,6 +642,7 @@ enum queue_stop_reason {
|
||||
IEEE80211_QUEUE_STOP_REASON_SKB_ADD,
|
||||
};
|
||||
|
||||
+#ifdef CONFIG_MAC80211_LEDS
|
||||
struct tpt_led_trigger {
|
||||
struct led_trigger trig;
|
||||
char name[32];
|
||||
@@ -652,6 +653,7 @@ struct tpt_led_trigger {
|
||||
unsigned long prev_traffic;
|
||||
unsigned long tx_bytes, rx_bytes;
|
||||
};
|
||||
+#endif
|
||||
|
||||
/**
|
||||
* mac80211 scan flags - currently active scan mode
|
@ -1,74 +0,0 @@ |
||||
--- a/drivers/net/wireless/ath/ath9k/xmit.c
|
||||
+++ b/drivers/net/wireless/ath/ath9k/xmit.c
|
||||
@@ -1172,7 +1172,7 @@ void ath_draintxq(struct ath_softc *sc,
|
||||
}
|
||||
}
|
||||
|
||||
-void ath_drain_all_txq(struct ath_softc *sc, bool retry_tx)
|
||||
+bool ath_drain_all_txq(struct ath_softc *sc, bool retry_tx)
|
||||
{
|
||||
struct ath_hw *ah = sc->sc_ah;
|
||||
struct ath_common *common = ath9k_hw_common(sc->sc_ah);
|
||||
@@ -1180,7 +1180,7 @@ void ath_drain_all_txq(struct ath_softc
|
||||
int i, npend = 0;
|
||||
|
||||
if (sc->sc_flags & SC_OP_INVALID)
|
||||
- return;
|
||||
+ return true;
|
||||
|
||||
/* Stop beacon queue */
|
||||
ath9k_hw_stoptxdma(sc->sc_ah, sc->beacon.beaconq);
|
||||
@@ -1194,23 +1194,15 @@ void ath_drain_all_txq(struct ath_softc
|
||||
}
|
||||
}
|
||||
|
||||
- if (npend) {
|
||||
- int r;
|
||||
-
|
||||
- ath_print(common, ATH_DBG_FATAL,
|
||||
- "Failed to stop TX DMA. Resetting hardware!\n");
|
||||
-
|
||||
- r = ath9k_hw_reset(ah, sc->sc_ah->curchan, ah->caldata, false);
|
||||
- if (r)
|
||||
- ath_print(common, ATH_DBG_FATAL,
|
||||
- "Unable to reset hardware; reset status %d\n",
|
||||
- r);
|
||||
- }
|
||||
+ if (npend)
|
||||
+ ath_print(common, ATH_DBG_FATAL, "Failed to stop TX DMA!\n");
|
||||
|
||||
for (i = 0; i < ATH9K_NUM_TX_QUEUES; i++) {
|
||||
if (ATH_TXQ_SETUP(sc, i))
|
||||
ath_draintxq(sc, &sc->tx.txq[i], retry_tx);
|
||||
}
|
||||
+
|
||||
+ return !npend;
|
||||
}
|
||||
|
||||
void ath_tx_cleanupq(struct ath_softc *sc, struct ath_txq *txq)
|
||||
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
|
||||
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
|
||||
@@ -311,7 +311,7 @@ void ath_rx_cleanup(struct ath_softc *sc
|
||||
int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp);
|
||||
struct ath_txq *ath_txq_setup(struct ath_softc *sc, int qtype, int subtype);
|
||||
void ath_tx_cleanupq(struct ath_softc *sc, struct ath_txq *txq);
|
||||
-void ath_drain_all_txq(struct ath_softc *sc, bool retry_tx);
|
||||
+bool ath_drain_all_txq(struct ath_softc *sc, bool retry_tx);
|
||||
void ath_draintxq(struct ath_softc *sc,
|
||||
struct ath_txq *txq, bool retry_tx);
|
||||
void ath_tx_node_init(struct ath_softc *sc, struct ath_node *an);
|
||||
--- a/drivers/net/wireless/ath/ath9k/main.c
|
||||
+++ b/drivers/net/wireless/ath/ath9k/main.c
|
||||
@@ -246,9 +246,10 @@ int ath_set_channel(struct ath_softc *sc
|
||||
* the relevant bits of the h/w.
|
||||
*/
|
||||
ath9k_hw_disable_interrupts(ah);
|
||||
- ath_drain_all_txq(sc, false);
|
||||
+ stopped = ath_drain_all_txq(sc, false);
|
||||
|
||||
- stopped = ath_stoprecv(sc);
|
||||
+ if (!ath_stoprecv(sc))
|
||||
+ stopped = false;
|
||||
|
||||
/* XXX: do not flush receive queue here. We don't want
|
||||
* to flush data frames already in queue because of
|
Loading…
Reference in new issue