mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-12-25 09:17:42 +02:00
ath9k: more fixes/cleanups for ar9280 and ar9300
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20835 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
bca3f225e9
commit
bce9592a38
File diff suppressed because it is too large
Load Diff
@ -8,7 +8,7 @@
|
|||||||
#include <asm/unaligned.h>
|
#include <asm/unaligned.h>
|
||||||
|
|
||||||
#include "hw.h"
|
#include "hw.h"
|
||||||
@@ -434,8 +435,16 @@ static int ath9k_hw_init_macaddr(struct
|
@@ -431,8 +432,16 @@ static int ath9k_hw_init_macaddr(struct
|
||||||
common->macaddr[2 * i] = eeval >> 8;
|
common->macaddr[2 * i] = eeval >> 8;
|
||||||
common->macaddr[2 * i + 1] = eeval & 0xff;
|
common->macaddr[2 * i + 1] = eeval & 0xff;
|
||||||
}
|
}
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
--- a/drivers/net/wireless/ath/ath9k/hw.c
|
--- a/drivers/net/wireless/ath/ath9k/hw.c
|
||||||
+++ b/drivers/net/wireless/ath/ath9k/hw.c
|
+++ b/drivers/net/wireless/ath/ath9k/hw.c
|
||||||
@@ -405,11 +405,8 @@ static void ath9k_hw_init_defaults(struc
|
@@ -402,11 +402,8 @@ static void ath9k_hw_init_defaults(struc
|
||||||
ah->hw_version.magic = AR5416_MAGIC;
|
ah->hw_version.magic = AR5416_MAGIC;
|
||||||
ah->hw_version.subvendorid = 0;
|
ah->hw_version.subvendorid = 0;
|
||||||
|
|
||||||
|
@ -11,7 +11,7 @@
|
|||||||
#include "hw.h"
|
#include "hw.h"
|
||||||
#include "hw-ops.h"
|
#include "hw-ops.h"
|
||||||
#include "rc.h"
|
#include "rc.h"
|
||||||
@@ -420,18 +422,23 @@ static void ath9k_hw_init_defaults(struc
|
@@ -417,18 +419,23 @@ static void ath9k_hw_init_defaults(struc
|
||||||
static int ath9k_hw_init_macaddr(struct ath_hw *ah)
|
static int ath9k_hw_init_macaddr(struct ath_hw *ah)
|
||||||
{
|
{
|
||||||
struct ath_common *common = ath9k_hw_common(ah);
|
struct ath_common *common = ath9k_hw_common(ah);
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
--- a/drivers/net/wireless/ath/ath9k/hw.c
|
--- a/drivers/net/wireless/ath/ath9k/hw.c
|
||||||
+++ b/drivers/net/wireless/ath/ath9k/hw.c
|
+++ b/drivers/net/wireless/ath/ath9k/hw.c
|
||||||
@@ -1306,7 +1306,7 @@ int ath9k_hw_reset(struct ath_hw *ah, st
|
@@ -1297,7 +1297,7 @@ int ath9k_hw_reset(struct ath_hw *ah, st
|
||||||
|
|
||||||
if (ah->config.rx_intr_mitigation) {
|
if (ah->config.rx_intr_mitigation) {
|
||||||
REG_RMW_FIELD(ah, AR_RIMT, AR_RIMT_LAST, 500);
|
REG_RMW_FIELD(ah, AR_RIMT, AR_RIMT_LAST, 500);
|
||||||
|
@ -54,7 +54,7 @@
|
|||||||
ath9k_reg_notifier);
|
ath9k_reg_notifier);
|
||||||
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
|
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
|
||||||
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
|
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
|
||||||
@@ -516,6 +516,8 @@ struct ath_softc {
|
@@ -517,6 +517,8 @@ struct ath_softc {
|
||||||
|
|
||||||
int beacon_interval;
|
int beacon_interval;
|
||||||
|
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
sc->sc_ah->led_pin = ATH_LED_PIN_DEF;
|
sc->sc_ah->led_pin = ATH_LED_PIN_DEF;
|
||||||
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
|
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
|
||||||
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
|
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
|
||||||
@@ -391,6 +391,7 @@ void ath9k_btcoex_timer_pause(struct ath
|
@@ -392,6 +392,7 @@ void ath9k_btcoex_timer_pause(struct ath
|
||||||
|
|
||||||
#define ATH_LED_PIN_DEF 1
|
#define ATH_LED_PIN_DEF 1
|
||||||
#define ATH_LED_PIN_9287 8
|
#define ATH_LED_PIN_9287 8
|
||||||
|
@ -91,7 +91,7 @@
|
|||||||
static ssize_t read_file_dma(struct file *file, char __user *user_buf,
|
static ssize_t read_file_dma(struct file *file, char __user *user_buf,
|
||||||
size_t count, loff_t *ppos)
|
size_t count, loff_t *ppos)
|
||||||
{
|
{
|
||||||
@@ -724,6 +808,16 @@ int ath9k_init_debug(struct ath_hw *ah)
|
@@ -730,6 +814,16 @@ int ath9k_init_debug(struct ath_hw *ah)
|
||||||
goto err;
|
goto err;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -108,7 +108,7 @@
|
|||||||
sc->debug.debugfs_dma = debugfs_create_file("dma", S_IRUSR,
|
sc->debug.debugfs_dma = debugfs_create_file("dma", S_IRUSR,
|
||||||
sc->debug.debugfs_phy, sc, &fops_dma);
|
sc->debug.debugfs_phy, sc, &fops_dma);
|
||||||
if (!sc->debug.debugfs_dma)
|
if (!sc->debug.debugfs_dma)
|
||||||
@@ -774,6 +868,8 @@ void ath9k_exit_debug(struct ath_hw *ah)
|
@@ -780,6 +874,8 @@ void ath9k_exit_debug(struct ath_hw *ah)
|
||||||
struct ath_common *common = ath9k_hw_common(ah);
|
struct ath_common *common = ath9k_hw_common(ah);
|
||||||
struct ath_softc *sc = (struct ath_softc *) common->priv;
|
struct ath_softc *sc = (struct ath_softc *) common->priv;
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
--- a/drivers/net/wireless/ath/ath9k/debug.c
|
--- a/drivers/net/wireless/ath/ath9k/debug.c
|
||||||
+++ b/drivers/net/wireless/ath/ath9k/debug.c
|
+++ b/drivers/net/wireless/ath/ath9k/debug.c
|
||||||
@@ -788,6 +788,86 @@ static const struct file_operations fops
|
@@ -794,6 +794,86 @@ static const struct file_operations fops
|
||||||
.owner = THIS_MODULE
|
.owner = THIS_MODULE
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -87,7 +87,7 @@
|
|||||||
int ath9k_init_debug(struct ath_hw *ah)
|
int ath9k_init_debug(struct ath_hw *ah)
|
||||||
{
|
{
|
||||||
struct ath_common *common = ath9k_hw_common(ah);
|
struct ath_common *common = ath9k_hw_common(ah);
|
||||||
@@ -857,6 +937,17 @@ int ath9k_init_debug(struct ath_hw *ah)
|
@@ -863,6 +943,17 @@ int ath9k_init_debug(struct ath_hw *ah)
|
||||||
if (!sc->debug.debugfs_recv)
|
if (!sc->debug.debugfs_recv)
|
||||||
goto err;
|
goto err;
|
||||||
|
|
||||||
@ -105,7 +105,7 @@
|
|||||||
return 0;
|
return 0;
|
||||||
err:
|
err:
|
||||||
ath9k_exit_debug(ah);
|
ath9k_exit_debug(ah);
|
||||||
@@ -870,6 +961,8 @@ void ath9k_exit_debug(struct ath_hw *ah)
|
@@ -876,6 +967,8 @@ void ath9k_exit_debug(struct ath_hw *ah)
|
||||||
|
|
||||||
debugfs_remove(sc->debug.debugfs_tx_chainmask);
|
debugfs_remove(sc->debug.debugfs_tx_chainmask);
|
||||||
debugfs_remove(sc->debug.debugfs_rx_chainmask);
|
debugfs_remove(sc->debug.debugfs_rx_chainmask);
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
--- a/drivers/net/wireless/ath/ath9k/hw.c
|
--- a/drivers/net/wireless/ath/ath9k/hw.c
|
||||||
+++ b/drivers/net/wireless/ath/ath9k/hw.c
|
+++ b/drivers/net/wireless/ath/ath9k/hw.c
|
||||||
@@ -1134,6 +1134,34 @@ static bool ath9k_hw_channel_change(stru
|
@@ -1125,6 +1125,34 @@ static bool ath9k_hw_channel_change(stru
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -37,7 +37,7 @@
|
|||||||
{
|
{
|
||||||
--- a/drivers/net/wireless/ath/ath9k/hw.h
|
--- a/drivers/net/wireless/ath/ath9k/hw.h
|
||||||
+++ b/drivers/net/wireless/ath/ath9k/hw.h
|
+++ b/drivers/net/wireless/ath/ath9k/hw.h
|
||||||
@@ -848,6 +848,7 @@ void ath9k_hw_set11nmac2040(struct ath_h
|
@@ -847,6 +847,7 @@ void ath9k_hw_set11nmac2040(struct ath_h
|
||||||
void ath9k_hw_beaconinit(struct ath_hw *ah, u32 next_beacon, u32 beacon_period);
|
void ath9k_hw_beaconinit(struct ath_hw *ah, u32 next_beacon, u32 beacon_period);
|
||||||
void ath9k_hw_set_sta_beacon_timers(struct ath_hw *ah,
|
void ath9k_hw_set_sta_beacon_timers(struct ath_hw *ah,
|
||||||
const struct ath9k_beacon_state *bs);
|
const struct ath9k_beacon_state *bs);
|
||||||
|
Loading…
Reference in New Issue
Block a user