Commit e0d687bd authored by Pavel Roskin's avatar Pavel Roskin Committed by John W. Linville

ath5k: merge ath5k_hw and ath5k_softc

Both ath5k_hw and ath5k_softc represent one instance of the hardware.
This duplication is historical and is not needed anymore.

Keep the name "ath5k_hw" for the merged structure and "ah" for the
variable pointing to it.  "ath5k_hw" is shorter than "ath5k_softc", more
descriptive and more widely used.

Put the combined structure to ath5k.h where the old ath5k_softc used to
be. Move some code from base.h to ath5k.h as needed.

Remove memory allocation for struct ath5k_hw and the corresponding error
handling.  Merge iobase and ah_iobase fields.
Signed-off-by: default avatarPavel Roskin <proski@gnu.org>
Acked-by: default avatarNick Kossifidis <mickflemm@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 49173592
...@@ -35,8 +35,8 @@ static void ath5k_ahb_read_cachesize(struct ath_common *common, int *csz) ...@@ -35,8 +35,8 @@ static void ath5k_ahb_read_cachesize(struct ath_common *common, int *csz)
static bool static bool
ath5k_ahb_eeprom_read(struct ath_common *common, u32 off, u16 *data) ath5k_ahb_eeprom_read(struct ath_common *common, u32 off, u16 *data)
{ {
struct ath5k_softc *sc = common->priv; struct ath5k_hw *ah = common->priv;
struct platform_device *pdev = to_platform_device(sc->dev); struct platform_device *pdev = to_platform_device(ah->dev);
struct ar231x_board_config *bcfg = pdev->dev.platform_data; struct ar231x_board_config *bcfg = pdev->dev.platform_data;
u16 *eeprom, *eeprom_end; u16 *eeprom, *eeprom_end;
...@@ -56,8 +56,7 @@ ath5k_ahb_eeprom_read(struct ath_common *common, u32 off, u16 *data) ...@@ -56,8 +56,7 @@ ath5k_ahb_eeprom_read(struct ath_common *common, u32 off, u16 *data)
int ath5k_hw_read_srev(struct ath5k_hw *ah) int ath5k_hw_read_srev(struct ath5k_hw *ah)
{ {
struct ath5k_softc *sc = ah->ah_sc; struct platform_device *pdev = to_platform_device(ah->dev);
struct platform_device *pdev = to_platform_device(sc->dev);
struct ar231x_board_config *bcfg = pdev->dev.platform_data; struct ar231x_board_config *bcfg = pdev->dev.platform_data;
ah->ah_mac_srev = bcfg->devid; ah->ah_mac_srev = bcfg->devid;
return 0; return 0;
...@@ -65,12 +64,11 @@ int ath5k_hw_read_srev(struct ath5k_hw *ah) ...@@ -65,12 +64,11 @@ int ath5k_hw_read_srev(struct ath5k_hw *ah)
static int ath5k_ahb_eeprom_read_mac(struct ath5k_hw *ah, u8 *mac) static int ath5k_ahb_eeprom_read_mac(struct ath5k_hw *ah, u8 *mac)
{ {
struct ath5k_softc *sc = ah->ah_sc; struct platform_device *pdev = to_platform_device(ah->dev);
struct platform_device *pdev = to_platform_device(sc->dev);
struct ar231x_board_config *bcfg = pdev->dev.platform_data; struct ar231x_board_config *bcfg = pdev->dev.platform_data;
u8 *cfg_mac; u8 *cfg_mac;
if (to_platform_device(sc->dev)->id == 0) if (to_platform_device(ah->dev)->id == 0)
cfg_mac = bcfg->config->wlan0_mac; cfg_mac = bcfg->config->wlan0_mac;
else else
cfg_mac = bcfg->config->wlan1_mac; cfg_mac = bcfg->config->wlan1_mac;
...@@ -90,7 +88,7 @@ static const struct ath_bus_ops ath_ahb_bus_ops = { ...@@ -90,7 +88,7 @@ static const struct ath_bus_ops ath_ahb_bus_ops = {
static int ath_ahb_probe(struct platform_device *pdev) static int ath_ahb_probe(struct platform_device *pdev)
{ {
struct ar231x_board_config *bcfg = pdev->dev.platform_data; struct ar231x_board_config *bcfg = pdev->dev.platform_data;
struct ath5k_softc *sc; struct ath5k_hw *ah;
struct ieee80211_hw *hw; struct ieee80211_hw *hw;
struct resource *res; struct resource *res;
void __iomem *mem; void __iomem *mem;
...@@ -127,19 +125,19 @@ static int ath_ahb_probe(struct platform_device *pdev) ...@@ -127,19 +125,19 @@ static int ath_ahb_probe(struct platform_device *pdev)
irq = res->start; irq = res->start;
hw = ieee80211_alloc_hw(sizeof(struct ath5k_softc), &ath5k_hw_ops); hw = ieee80211_alloc_hw(sizeof(struct ath5k_hw), &ath5k_hw_ops);
if (hw == NULL) { if (hw == NULL) {
dev_err(&pdev->dev, "no memory for ieee80211_hw\n"); dev_err(&pdev->dev, "no memory for ieee80211_hw\n");
ret = -ENOMEM; ret = -ENOMEM;
goto err_out; goto err_out;
} }
sc = hw->priv; ah = hw->priv;
sc->hw = hw; ah->hw = hw;
sc->dev = &pdev->dev; ah->dev = &pdev->dev;
sc->iobase = mem; ah->iobase = mem;
sc->irq = irq; ah->irq = irq;
sc->devid = bcfg->devid; ah->devid = bcfg->devid;
if (bcfg->devid >= AR5K_SREV_AR2315_R6) { if (bcfg->devid >= AR5K_SREV_AR2315_R6) {
/* Enable WMAC AHB arbitration */ /* Enable WMAC AHB arbitration */
...@@ -155,7 +153,7 @@ static int ath_ahb_probe(struct platform_device *pdev) ...@@ -155,7 +153,7 @@ static int ath_ahb_probe(struct platform_device *pdev)
/* Enable WMAC DMA access (assuming 5312 or 231x*/ /* Enable WMAC DMA access (assuming 5312 or 231x*/
/* TODO: check other platforms */ /* TODO: check other platforms */
reg = __raw_readl((void __iomem *) AR5K_AR5312_ENABLE); reg = __raw_readl((void __iomem *) AR5K_AR5312_ENABLE);
if (to_platform_device(sc->dev)->id == 0) if (to_platform_device(ah->dev)->id == 0)
reg |= AR5K_AR5312_ENABLE_WLAN0; reg |= AR5K_AR5312_ENABLE_WLAN0;
else else
reg |= AR5K_AR5312_ENABLE_WLAN1; reg |= AR5K_AR5312_ENABLE_WLAN1;
...@@ -166,13 +164,13 @@ static int ath_ahb_probe(struct platform_device *pdev) ...@@ -166,13 +164,13 @@ static int ath_ahb_probe(struct platform_device *pdev)
* used as pass-through. Disable 2 GHz support in the * used as pass-through. Disable 2 GHz support in the
* driver for it * driver for it
*/ */
if (to_platform_device(sc->dev)->id == 0 && if (to_platform_device(ah->dev)->id == 0 &&
(bcfg->config->flags & (BD_WLAN0 | BD_WLAN1)) == (bcfg->config->flags & (BD_WLAN0 | BD_WLAN1)) ==
(BD_WLAN1 | BD_WLAN0)) (BD_WLAN1 | BD_WLAN0))
__set_bit(ATH_STAT_2G_DISABLED, sc->status); __set_bit(ATH_STAT_2G_DISABLED, ah->status);
} }
ret = ath5k_init_softc(sc, &ath_ahb_bus_ops); ret = ath5k_init_softc(ah, &ath_ahb_bus_ops);
if (ret != 0) { if (ret != 0) {
dev_err(&pdev->dev, "failed to attach device, err=%d\n", ret); dev_err(&pdev->dev, "failed to attach device, err=%d\n", ret);
ret = -ENODEV; ret = -ENODEV;
...@@ -194,13 +192,13 @@ static int ath_ahb_remove(struct platform_device *pdev) ...@@ -194,13 +192,13 @@ static int ath_ahb_remove(struct platform_device *pdev)
{ {
struct ar231x_board_config *bcfg = pdev->dev.platform_data; struct ar231x_board_config *bcfg = pdev->dev.platform_data;
struct ieee80211_hw *hw = platform_get_drvdata(pdev); struct ieee80211_hw *hw = platform_get_drvdata(pdev);
struct ath5k_softc *sc; struct ath5k_hw *ah;
u32 reg; u32 reg;
if (!hw) if (!hw)
return 0; return 0;
sc = hw->priv; ah = hw->priv;
if (bcfg->devid >= AR5K_SREV_AR2315_R6) { if (bcfg->devid >= AR5K_SREV_AR2315_R6) {
/* Disable WMAC AHB arbitration */ /* Disable WMAC AHB arbitration */
...@@ -210,14 +208,14 @@ static int ath_ahb_remove(struct platform_device *pdev) ...@@ -210,14 +208,14 @@ static int ath_ahb_remove(struct platform_device *pdev)
} else { } else {
/*Stop DMA access */ /*Stop DMA access */
reg = __raw_readl((void __iomem *) AR5K_AR5312_ENABLE); reg = __raw_readl((void __iomem *) AR5K_AR5312_ENABLE);
if (to_platform_device(sc->dev)->id == 0) if (to_platform_device(ah->dev)->id == 0)
reg &= ~AR5K_AR5312_ENABLE_WLAN0; reg &= ~AR5K_AR5312_ENABLE_WLAN0;
else else
reg &= ~AR5K_AR5312_ENABLE_WLAN1; reg &= ~AR5K_AR5312_ENABLE_WLAN1;
__raw_writel(reg, (void __iomem *) AR5K_AR5312_ENABLE); __raw_writel(reg, (void __iomem *) AR5K_AR5312_ENABLE);
} }
ath5k_deinit_softc(sc); ath5k_deinit_softc(ah);
platform_set_drvdata(pdev, NULL); platform_set_drvdata(pdev, NULL);
ieee80211_free_hw(hw); ieee80211_free_hw(hw);
......
This diff is collapsed.
This diff is collapsed.
...@@ -59,7 +59,7 @@ static int ath5k_hw_post(struct ath5k_hw *ah) ...@@ -59,7 +59,7 @@ static int ath5k_hw_post(struct ath5k_hw *ah)
cur_val = ath5k_hw_reg_read(ah, cur_reg); cur_val = ath5k_hw_reg_read(ah, cur_reg);
if (cur_val != var_pattern) { if (cur_val != var_pattern) {
ATH5K_ERR(ah->ah_sc, "POST Failed !!!\n"); ATH5K_ERR(ah, "POST Failed !!!\n");
return -EAGAIN; return -EAGAIN;
} }
...@@ -74,7 +74,7 @@ static int ath5k_hw_post(struct ath5k_hw *ah) ...@@ -74,7 +74,7 @@ static int ath5k_hw_post(struct ath5k_hw *ah)
cur_val = ath5k_hw_reg_read(ah, cur_reg); cur_val = ath5k_hw_reg_read(ah, cur_reg);
if (cur_val != var_pattern) { if (cur_val != var_pattern) {
ATH5K_ERR(ah->ah_sc, "POST Failed !!!\n"); ATH5K_ERR(ah, "POST Failed !!!\n");
return -EAGAIN; return -EAGAIN;
} }
...@@ -95,19 +95,18 @@ static int ath5k_hw_post(struct ath5k_hw *ah) ...@@ -95,19 +95,18 @@ static int ath5k_hw_post(struct ath5k_hw *ah)
/** /**
* ath5k_hw_init - Check if hw is supported and init the needed structs * ath5k_hw_init - Check if hw is supported and init the needed structs
* *
* @sc: The &struct ath5k_softc we got from the driver's init_softc function * @ah: The &struct ath5k_hw we got from the driver's init_softc function
* *
* Check if the device is supported, perform a POST and initialize the needed * Check if the device is supported, perform a POST and initialize the needed
* structs. Returns -ENOMEM if we don't have memory for the needed structs, * structs. Returns -ENOMEM if we don't have memory for the needed structs,
* -ENODEV if the device is not supported or prints an error msg if something * -ENODEV if the device is not supported or prints an error msg if something
* else went wrong. * else went wrong.
*/ */
int ath5k_hw_init(struct ath5k_softc *sc) int ath5k_hw_init(struct ath5k_hw *ah)
{ {
static const u8 zero_mac[ETH_ALEN] = { }; static const u8 zero_mac[ETH_ALEN] = { };
struct ath5k_hw *ah = sc->ah;
struct ath_common *common = ath5k_hw_common(ah); struct ath_common *common = ath5k_hw_common(ah);
struct pci_dev *pdev = sc->pdev; struct pci_dev *pdev = ah->pdev;
struct ath5k_eeprom_info *ee; struct ath5k_eeprom_info *ee;
int ret; int ret;
u32 srev; u32 srev;
...@@ -123,8 +122,8 @@ int ath5k_hw_init(struct ath5k_softc *sc) ...@@ -123,8 +122,8 @@ int ath5k_hw_init(struct ath5k_softc *sc)
ah->ah_retry_long = AR5K_INIT_RETRY_LONG; ah->ah_retry_long = AR5K_INIT_RETRY_LONG;
ah->ah_ant_mode = AR5K_ANTMODE_DEFAULT; ah->ah_ant_mode = AR5K_ANTMODE_DEFAULT;
ah->ah_noise_floor = -95; /* until first NF calibration is run */ ah->ah_noise_floor = -95; /* until first NF calibration is run */
sc->ani_state.ani_mode = ATH5K_ANI_MODE_AUTO; ah->ani_state.ani_mode = ATH5K_ANI_MODE_AUTO;
ah->ah_current_channel = &sc->channels[0]; ah->ah_current_channel = &ah->channels[0];
/* /*
* Find the mac version * Find the mac version
...@@ -237,7 +236,7 @@ int ath5k_hw_init(struct ath5k_softc *sc) ...@@ -237,7 +236,7 @@ int ath5k_hw_init(struct ath5k_softc *sc)
ah->ah_single_chip = true; ah->ah_single_chip = true;
ah->ah_radio_5ghz_revision = AR5K_SREV_RAD_2413; ah->ah_radio_5ghz_revision = AR5K_SREV_RAD_2413;
} else { } else {
ATH5K_ERR(sc, "Couldn't identify radio revision.\n"); ATH5K_ERR(ah, "Couldn't identify radio revision.\n");
ret = -ENODEV; ret = -ENODEV;
goto err; goto err;
} }
...@@ -246,7 +245,7 @@ int ath5k_hw_init(struct ath5k_softc *sc) ...@@ -246,7 +245,7 @@ int ath5k_hw_init(struct ath5k_softc *sc)
/* Return on unsupported chips (unsupported eeprom etc) */ /* Return on unsupported chips (unsupported eeprom etc) */
if ((srev >= AR5K_SREV_AR5416) && (srev < AR5K_SREV_AR2425)) { if ((srev >= AR5K_SREV_AR5416) && (srev < AR5K_SREV_AR2425)) {
ATH5K_ERR(sc, "Device not yet supported.\n"); ATH5K_ERR(ah, "Device not yet supported.\n");
ret = -ENODEV; ret = -ENODEV;
goto err; goto err;
} }
...@@ -268,7 +267,7 @@ int ath5k_hw_init(struct ath5k_softc *sc) ...@@ -268,7 +267,7 @@ int ath5k_hw_init(struct ath5k_softc *sc)
*/ */
ret = ath5k_eeprom_init(ah); ret = ath5k_eeprom_init(ah);
if (ret) { if (ret) {
ATH5K_ERR(sc, "unable to init EEPROM\n"); ATH5K_ERR(ah, "unable to init EEPROM\n");
goto err; goto err;
} }
...@@ -309,17 +308,17 @@ int ath5k_hw_init(struct ath5k_softc *sc) ...@@ -309,17 +308,17 @@ int ath5k_hw_init(struct ath5k_softc *sc)
/* Get misc capabilities */ /* Get misc capabilities */
ret = ath5k_hw_set_capabilities(ah); ret = ath5k_hw_set_capabilities(ah);
if (ret) { if (ret) {
ATH5K_ERR(sc, "unable to get device capabilities\n"); ATH5K_ERR(ah, "unable to get device capabilities\n");
goto err; goto err;
} }
if (test_bit(ATH_STAT_2G_DISABLED, sc->status)) { if (test_bit(ATH_STAT_2G_DISABLED, ah->status)) {
__clear_bit(AR5K_MODE_11B, ah->ah_capabilities.cap_mode); __clear_bit(AR5K_MODE_11B, ah->ah_capabilities.cap_mode);
__clear_bit(AR5K_MODE_11G, ah->ah_capabilities.cap_mode); __clear_bit(AR5K_MODE_11G, ah->ah_capabilities.cap_mode);
} }
/* Crypto settings */ /* Crypto settings */
common->keymax = (sc->ah->ah_version == AR5K_AR5210 ? common->keymax = (ah->ah_version == AR5K_AR5210 ?
AR5K_KEYTABLE_SIZE_5210 : AR5K_KEYTABLE_SIZE_5211); AR5K_KEYTABLE_SIZE_5210 : AR5K_KEYTABLE_SIZE_5211);
if (srev >= AR5K_SREV_AR5212_V4 && if (srev >= AR5K_SREV_AR5212_V4 &&
...@@ -339,7 +338,7 @@ int ath5k_hw_init(struct ath5k_softc *sc) ...@@ -339,7 +338,7 @@ int ath5k_hw_init(struct ath5k_softc *sc)
/* Set BSSID to bcast address: ff:ff:ff:ff:ff:ff for now */ /* Set BSSID to bcast address: ff:ff:ff:ff:ff:ff for now */
memcpy(common->curbssid, ath_bcast_mac, ETH_ALEN); memcpy(common->curbssid, ath_bcast_mac, ETH_ALEN);
ath5k_hw_set_bssid(ah); ath5k_hw_set_bssid(ah);
ath5k_hw_set_opmode(ah, sc->opmode); ath5k_hw_set_opmode(ah, ah->opmode);
ath5k_hw_rfgain_opt_init(ah); ath5k_hw_rfgain_opt_init(ah);
...@@ -360,7 +359,7 @@ int ath5k_hw_init(struct ath5k_softc *sc) ...@@ -360,7 +359,7 @@ int ath5k_hw_init(struct ath5k_softc *sc)
*/ */
void ath5k_hw_deinit(struct ath5k_hw *ah) void ath5k_hw_deinit(struct ath5k_hw *ah)
{ {
__set_bit(ATH_STAT_INVALID, ah->ah_sc->status); __set_bit(ATH_STAT_INVALID, ah->status);
if (ah->ah_rf_banks != NULL) if (ah->ah_rf_banks != NULL)
kfree(ah->ah_rf_banks); kfree(ah->ah_rf_banks);
......
This diff is collapsed.
...@@ -45,23 +45,13 @@ ...@@ -45,23 +45,13 @@
#include <linux/list.h> #include <linux/list.h>
#include <linux/wireless.h> #include <linux/wireless.h>
#include <linux/if_ether.h> #include <linux/if_ether.h>
#include <linux/leds.h>
#include <linux/rfkill.h> #include <linux/rfkill.h>
#include <linux/workqueue.h> #include <linux/workqueue.h>
#include "ath5k.h" #include "ath5k.h"
#include "debug.h"
#include "ani.h"
#include "../regd.h" #include "../regd.h"
#include "../ath.h" #include "../ath.h"
#define ATH_RXBUF 40 /* number of RX buffers */
#define ATH_TXBUF 200 /* number of TX buffers */
#define ATH_BCBUF 4 /* number of beacon buffers */
#define ATH5K_TXQ_LEN_MAX (ATH_TXBUF / 4) /* bufs per queue */
#define ATH5K_TXQ_LEN_LOW (ATH5K_TXQ_LEN_MAX / 2) /* low mark */
struct ath5k_buf { struct ath5k_buf {
struct list_head list; struct list_head list;
struct ath5k_desc *desc; /* virtual addr of desc */ struct ath5k_desc *desc; /* virtual addr of desc */
...@@ -70,94 +60,6 @@ struct ath5k_buf { ...@@ -70,94 +60,6 @@ struct ath5k_buf {
dma_addr_t skbaddr;/* physical addr of skb data */ dma_addr_t skbaddr;/* physical addr of skb data */
}; };
/*
* Data transmit queue state. One of these exists for each
* hardware transmit queue. Packets sent to us from above
* are assigned to queues based on their priority. Not all
* devices support a complete set of hardware transmit queues.
* For those devices the array sc_ac2q will map multiple
* priorities to fewer hardware queues (typically all to one
* hardware queue).
*/
struct ath5k_txq {
unsigned int qnum; /* hardware q number */
u32 *link; /* link ptr in last TX desc */
struct list_head q; /* transmit queue */
spinlock_t lock; /* lock on q and link */
bool setup;
int txq_len; /* number of queued buffers */
int txq_max; /* max allowed num of queued buffers */
bool txq_poll_mark;
unsigned int txq_stuck; /* informational counter */
};
#define ATH5K_LED_MAX_NAME_LEN 31
/*
* State for LED triggers
*/
struct ath5k_led {
char name[ATH5K_LED_MAX_NAME_LEN + 1]; /* name of the LED in sysfs */
struct ath5k_softc *sc; /* driver state */
struct led_classdev led_dev; /* led classdev */
};
/* Rfkill */
struct ath5k_rfkill {
/* GPIO PIN for rfkill */
u16 gpio;
/* polarity of rfkill GPIO PIN */
bool polarity;
/* RFKILL toggle tasklet */
struct tasklet_struct toggleq;
};
/* statistics */
struct ath5k_statistics {
/* antenna use */
unsigned int antenna_rx[5]; /* frames count per antenna RX */
unsigned int antenna_tx[5]; /* frames count per antenna TX */
/* frame errors */
unsigned int rx_all_count; /* all RX frames, including errors */
unsigned int tx_all_count; /* all TX frames, including errors */
unsigned int rx_bytes_count; /* all RX bytes, including errored pkts
* and the MAC headers for each packet
*/
unsigned int tx_bytes_count; /* all TX bytes, including errored pkts
* and the MAC headers and padding for
* each packet.
*/
unsigned int rxerr_crc;
unsigned int rxerr_phy;
unsigned int rxerr_phy_code[32];
unsigned int rxerr_fifo;
unsigned int rxerr_decrypt;
unsigned int rxerr_mic;
unsigned int rxerr_proc;
unsigned int rxerr_jumbo;
unsigned int txerr_retry;
unsigned int txerr_fifo;
unsigned int txerr_filt;
/* MIB counters */
unsigned int ack_fail;
unsigned int rts_fail;
unsigned int rts_ok;
unsigned int fcs_error;
unsigned int beacons;
unsigned int mib_intr;
unsigned int rxorn_intr;
unsigned int rxeol_intr;
};
#if CHAN_DEBUG
#define ATH_CHAN_MAX (26 + 26 + 26 + 200 + 200)
#else
#define ATH_CHAN_MAX (14 + 14 + 14 + 252 + 20)
#endif
struct ath5k_vif { struct ath5k_vif {
bool assoc; /* are we associated or not */ bool assoc; /* are we associated or not */
enum nl80211_iftype opmode; enum nl80211_iftype opmode;
...@@ -166,104 +68,6 @@ struct ath5k_vif { ...@@ -166,104 +68,6 @@ struct ath5k_vif {
u8 lladdr[ETH_ALEN]; u8 lladdr[ETH_ALEN];
}; };
/* Software Carrier, keeps track of the driver state
* associated with an instance of a device */
struct ath5k_softc {
struct pci_dev *pdev;
struct device *dev; /* for dma mapping */
int irq;
u16 devid;
void __iomem *iobase; /* address of the device */
struct mutex lock; /* dev-level lock */
struct ieee80211_hw *hw; /* IEEE 802.11 common */
struct ieee80211_supported_band sbands[IEEE80211_NUM_BANDS];
struct ieee80211_channel channels[ATH_CHAN_MAX];
struct ieee80211_rate rates[IEEE80211_NUM_BANDS][AR5K_MAX_RATES];
s8 rate_idx[IEEE80211_NUM_BANDS][AR5K_MAX_RATES];
enum nl80211_iftype opmode;
struct ath5k_hw *ah; /* Atheros HW */
#ifdef CONFIG_ATH5K_DEBUG
struct ath5k_dbg_info debug; /* debug info */
#endif /* CONFIG_ATH5K_DEBUG */
struct ath5k_buf *bufptr; /* allocated buffer ptr */
struct ath5k_desc *desc; /* TX/RX descriptors */
dma_addr_t desc_daddr; /* DMA (physical) address */
size_t desc_len; /* size of TX/RX descriptors */
DECLARE_BITMAP(status, 6);
#define ATH_STAT_INVALID 0 /* disable hardware accesses */
#define ATH_STAT_MRRETRY 1 /* multi-rate retry support */
#define ATH_STAT_PROMISC 2
#define ATH_STAT_LEDSOFT 3 /* enable LED gpio status */
#define ATH_STAT_STARTED 4 /* opened & irqs enabled */
#define ATH_STAT_2G_DISABLED 5 /* multiband radio without 2G */
unsigned int filter_flags; /* HW flags, AR5K_RX_FILTER_* */
struct ieee80211_channel *curchan; /* current h/w channel */
u16 nvifs;
enum ath5k_int imask; /* interrupt mask copy */
spinlock_t irqlock;
bool rx_pending; /* rx tasklet pending */
bool tx_pending; /* tx tasklet pending */
u8 lladdr[ETH_ALEN];
u8 bssidmask[ETH_ALEN];
unsigned int led_pin, /* GPIO pin for driving LED */
led_on; /* pin setting for LED on */
struct work_struct reset_work; /* deferred chip reset */
unsigned int rxbufsize; /* rx size based on mtu */
struct list_head rxbuf; /* receive buffer */
spinlock_t rxbuflock;
u32 *rxlink; /* link ptr in last RX desc */
struct tasklet_struct rxtq; /* rx intr tasklet */
struct ath5k_led rx_led; /* rx led */
struct list_head txbuf; /* transmit buffer */
spinlock_t txbuflock;
unsigned int txbuf_len; /* buf count in txbuf list */
struct ath5k_txq txqs[AR5K_NUM_TX_QUEUES]; /* tx queues */
struct tasklet_struct txtq; /* tx intr tasklet */
struct ath5k_led tx_led; /* tx led */
struct ath5k_rfkill rf_kill;
struct tasklet_struct calib; /* calibration tasklet */
spinlock_t block; /* protects beacon */
struct tasklet_struct beacontq; /* beacon intr tasklet */
struct list_head bcbuf; /* beacon buffer */
struct ieee80211_vif *bslot[ATH_BCBUF];
u16 num_ap_vifs;
u16 num_adhoc_vifs;
unsigned int bhalq, /* SW q for outgoing beacons */
bmisscount, /* missed beacon transmits */
bintval, /* beacon interval in TU */
bsent;
unsigned int nexttbtt; /* next beacon time in TU */
struct ath5k_txq *cabq; /* content after beacon */
int power_level; /* Requested tx power in dBm */
bool assoc; /* associate state */
bool enable_beacon; /* true if beacons are on */
struct ath5k_statistics stats;
struct ath5k_ani_state ani_state;
struct tasklet_struct ani_tasklet; /* ANI calibration */
struct delayed_work tx_complete_work;
struct survey_info survey; /* collected survey info */
};
struct ath5k_vif_iter_data { struct ath5k_vif_iter_data {
const u8 *hw_macaddr; const u8 *hw_macaddr;
u8 mask[ETH_ALEN]; u8 mask[ETH_ALEN];
......
This diff is collapsed.
...@@ -61,7 +61,6 @@ ...@@ -61,7 +61,6 @@
#ifndef _ATH5K_DEBUG_H #ifndef _ATH5K_DEBUG_H
#define _ATH5K_DEBUG_H #define _ATH5K_DEBUG_H
struct ath5k_softc;
struct ath5k_hw; struct ath5k_hw;
struct sk_buff; struct sk_buff;
struct ath5k_buf; struct ath5k_buf;
...@@ -127,39 +126,39 @@ enum ath5k_debug_level { ...@@ -127,39 +126,39 @@ enum ath5k_debug_level {
} while (0) } while (0)
void void
ath5k_debug_init_device(struct ath5k_softc *sc); ath5k_debug_init_device(struct ath5k_hw *ah);
void void
ath5k_debug_printrxbuffs(struct ath5k_softc *sc, struct ath5k_hw *ah); ath5k_debug_printrxbuffs(struct ath5k_hw *ah);
void void
ath5k_debug_dump_bands(struct ath5k_softc *sc); ath5k_debug_dump_bands(struct ath5k_hw *ah);
void void
ath5k_debug_printtxbuf(struct ath5k_softc *sc, struct ath5k_buf *bf); ath5k_debug_printtxbuf(struct ath5k_hw *ah, struct ath5k_buf *bf);
#else /* no debugging */ #else /* no debugging */
#include <linux/compiler.h> #include <linux/compiler.h>
static inline void __attribute__ ((format (printf, 3, 4))) static inline void __attribute__ ((format (printf, 3, 4)))
ATH5K_DBG(struct ath5k_softc *sc, unsigned int m, const char *fmt, ...) {} ATH5K_DBG(struct ath5k_hw *ah, unsigned int m, const char *fmt, ...) {}
static inline void __attribute__ ((format (printf, 3, 4))) static inline void __attribute__ ((format (printf, 3, 4)))
ATH5K_DBG_UNLIMIT(struct ath5k_softc *sc, unsigned int m, const char *fmt, ...) ATH5K_DBG_UNLIMIT(struct ath5k_hw *ah, unsigned int m, const char *fmt, ...)
{} {}
static inline void static inline void
ath5k_debug_init_device(struct ath5k_softc *sc) {} ath5k_debug_init_device(struct ath5k_hw *ah) {}
static inline void static inline void
ath5k_debug_printrxbuffs(struct ath5k_softc *sc, struct ath5k_hw *ah) {} ath5k_debug_printrxbuffs(struct ath5k_hw *ah) {}
static inline void static inline void
ath5k_debug_dump_bands(struct ath5k_softc *sc) {} ath5k_debug_dump_bands(struct ath5k_hw *ah) {}
static inline void static inline void
ath5k_debug_printtxbuf(struct ath5k_softc *sc, struct ath5k_buf *bf) {} ath5k_debug_printtxbuf(struct ath5k_hw *ah, struct ath5k_buf *bf) {}
#endif /* ifdef CONFIG_ATH5K_DEBUG */ #endif /* ifdef CONFIG_ATH5K_DEBUG */
......
...@@ -55,12 +55,12 @@ ath5k_hw_setup_2word_tx_desc(struct ath5k_hw *ah, struct ath5k_desc *desc, ...@@ -55,12 +55,12 @@ ath5k_hw_setup_2word_tx_desc(struct ath5k_hw *ah, struct ath5k_desc *desc,
* noise on the channel, so it is important to avoid this. * noise on the channel, so it is important to avoid this.
*/ */
if (unlikely(tx_tries0 == 0)) { if (unlikely(tx_tries0 == 0)) {
ATH5K_ERR(ah->ah_sc, "zero retries\n"); ATH5K_ERR(ah, "zero retries\n");
WARN_ON(1); WARN_ON(1);
return -EINVAL; return -EINVAL;
} }
if (unlikely(tx_rate0 == 0)) { if (unlikely(tx_rate0 == 0)) {
ATH5K_ERR(ah->ah_sc, "zero rate\n"); ATH5K_ERR(ah, "zero rate\n");
WARN_ON(1); WARN_ON(1);
return -EINVAL; return -EINVAL;
} }
...@@ -203,12 +203,12 @@ static int ath5k_hw_setup_4word_tx_desc(struct ath5k_hw *ah, ...@@ -203,12 +203,12 @@ static int ath5k_hw_setup_4word_tx_desc(struct ath5k_hw *ah,
* noise on the channel, so it is important to avoid this. * noise on the channel, so it is important to avoid this.
*/ */
if (unlikely(tx_tries0 == 0)) { if (unlikely(tx_tries0 == 0)) {
ATH5K_ERR(ah->ah_sc, "zero retries\n"); ATH5K_ERR(ah, "zero retries\n");
WARN_ON(1); WARN_ON(1);
return -EINVAL; return -EINVAL;
} }
if (unlikely(tx_rate0 == 0)) { if (unlikely(tx_rate0 == 0)) {
ATH5K_ERR(ah->ah_sc, "zero rate\n"); ATH5K_ERR(ah, "zero rate\n");
WARN_ON(1); WARN_ON(1);
return -EINVAL; return -EINVAL;
} }
...@@ -316,7 +316,7 @@ ath5k_hw_setup_mrr_tx_desc(struct ath5k_hw *ah, struct ath5k_desc *desc, ...@@ -316,7 +316,7 @@ ath5k_hw_setup_mrr_tx_desc(struct ath5k_hw *ah, struct ath5k_desc *desc,
if (unlikely((tx_rate1 == 0 && tx_tries1 != 0) || if (unlikely((tx_rate1 == 0 && tx_tries1 != 0) ||
(tx_rate2 == 0 && tx_tries2 != 0) || (tx_rate2 == 0 && tx_tries2 != 0) ||
(tx_rate3 == 0 && tx_tries3 != 0))) { (tx_rate3 == 0 && tx_tries3 != 0))) {
ATH5K_ERR(ah->ah_sc, "zero rate\n"); ATH5K_ERR(ah, "zero rate\n");
WARN_ON(1); WARN_ON(1);
return -EINVAL; return -EINVAL;
} }
......
...@@ -73,7 +73,7 @@ static int ath5k_hw_stop_rx_dma(struct ath5k_hw *ah) ...@@ -73,7 +73,7 @@ static int ath5k_hw_stop_rx_dma(struct ath5k_hw *ah)
udelay(100); udelay(100);
if (!i) if (!i)
ATH5K_DBG(ah->ah_sc, ATH5K_DEBUG_DMA, ATH5K_DBG(ah, ATH5K_DEBUG_DMA,
"failed to stop RX DMA !\n"); "failed to stop RX DMA !\n");
return i ? 0 : -EBUSY; return i ? 0 : -EBUSY;
...@@ -100,7 +100,7 @@ u32 ath5k_hw_get_rxdp(struct ath5k_hw *ah) ...@@ -100,7 +100,7 @@ u32 ath5k_hw_get_rxdp(struct ath5k_hw *ah)
int ath5k_hw_set_rxdp(struct ath5k_hw *ah, u32 phys_addr) int ath5k_hw_set_rxdp(struct ath5k_hw *ah, u32 phys_addr)
{ {
if (ath5k_hw_reg_read(ah, AR5K_CR) & AR5K_CR_RXE) { if (ath5k_hw_reg_read(ah, AR5K_CR) & AR5K_CR_RXE) {
ATH5K_DBG(ah->ah_sc, ATH5K_DEBUG_DMA, ATH5K_DBG(ah, ATH5K_DEBUG_DMA,
"tried to set RXDP while rx was active !\n"); "tried to set RXDP while rx was active !\n");
return -EIO; return -EIO;
} }
...@@ -243,7 +243,7 @@ static int ath5k_hw_stop_tx_dma(struct ath5k_hw *ah, unsigned int queue) ...@@ -243,7 +243,7 @@ static int ath5k_hw_stop_tx_dma(struct ath5k_hw *ah, unsigned int queue)
udelay(100); udelay(100);
if (AR5K_REG_READ_Q(ah, AR5K_QCU_TXE, queue)) if (AR5K_REG_READ_Q(ah, AR5K_QCU_TXE, queue))
ATH5K_DBG(ah->ah_sc, ATH5K_DEBUG_DMA, ATH5K_DBG(ah, ATH5K_DEBUG_DMA,
"queue %i didn't stop !\n", queue); "queue %i didn't stop !\n", queue);
/* Check for pending frames */ /* Check for pending frames */
...@@ -295,7 +295,7 @@ static int ath5k_hw_stop_tx_dma(struct ath5k_hw *ah, unsigned int queue) ...@@ -295,7 +295,7 @@ static int ath5k_hw_stop_tx_dma(struct ath5k_hw *ah, unsigned int queue)
AR5K_DIAG_SW_CHANNEL_IDLE_HIGH); AR5K_DIAG_SW_CHANNEL_IDLE_HIGH);
if (pending) if (pending)
ATH5K_DBG(ah->ah_sc, ATH5K_DEBUG_DMA, ATH5K_DBG(ah, ATH5K_DEBUG_DMA,
"quiet mechanism didn't work q:%i !\n", "quiet mechanism didn't work q:%i !\n",
queue); queue);
} }
...@@ -309,7 +309,7 @@ static int ath5k_hw_stop_tx_dma(struct ath5k_hw *ah, unsigned int queue) ...@@ -309,7 +309,7 @@ static int ath5k_hw_stop_tx_dma(struct ath5k_hw *ah, unsigned int queue)
/* Clear register */ /* Clear register */
ath5k_hw_reg_write(ah, 0, AR5K_QCU_TXD); ath5k_hw_reg_write(ah, 0, AR5K_QCU_TXD);
if (pending) { if (pending) {
ATH5K_DBG(ah->ah_sc, ATH5K_DEBUG_DMA, ATH5K_DBG(ah, ATH5K_DEBUG_DMA,
"tx dma didn't stop (q:%i, frm:%i) !\n", "tx dma didn't stop (q:%i, frm:%i) !\n",
queue, pending); queue, pending);
return -EBUSY; return -EBUSY;
...@@ -333,7 +333,7 @@ int ath5k_hw_stop_beacon_queue(struct ath5k_hw *ah, unsigned int queue) ...@@ -333,7 +333,7 @@ int ath5k_hw_stop_beacon_queue(struct ath5k_hw *ah, unsigned int queue)
int ret; int ret;
ret = ath5k_hw_stop_tx_dma(ah, queue); ret = ath5k_hw_stop_tx_dma(ah, queue);
if (ret) { if (ret) {
ATH5K_DBG(ah->ah_sc, ATH5K_DEBUG_DMA, ATH5K_DBG(ah, ATH5K_DEBUG_DMA,
"beacon queue didn't stop !\n"); "beacon queue didn't stop !\n");
return -EIO; return -EIO;
} }
......
...@@ -105,7 +105,7 @@ ath5k_eeprom_init_header(struct ath5k_hw *ah) ...@@ -105,7 +105,7 @@ ath5k_eeprom_init_header(struct ath5k_hw *ah)
* big still, waiting on a better value. * big still, waiting on a better value.
*/ */
if (eep_max > (3 * AR5K_EEPROM_INFO_MAX)) { if (eep_max > (3 * AR5K_EEPROM_INFO_MAX)) {
ATH5K_ERR(ah->ah_sc, "Invalid max custom EEPROM size: " ATH5K_ERR(ah, "Invalid max custom EEPROM size: "
"%d (0x%04x) max expected: %d (0x%04x)\n", "%d (0x%04x) max expected: %d (0x%04x)\n",
eep_max, eep_max, eep_max, eep_max,
3 * AR5K_EEPROM_INFO_MAX, 3 * AR5K_EEPROM_INFO_MAX,
...@@ -119,7 +119,7 @@ ath5k_eeprom_init_header(struct ath5k_hw *ah) ...@@ -119,7 +119,7 @@ ath5k_eeprom_init_header(struct ath5k_hw *ah)
cksum ^= val; cksum ^= val;
} }
if (cksum != AR5K_EEPROM_INFO_CKSUM) { if (cksum != AR5K_EEPROM_INFO_CKSUM) {
ATH5K_ERR(ah->ah_sc, "Invalid EEPROM " ATH5K_ERR(ah, "Invalid EEPROM "
"checksum: 0x%04x eep_max: 0x%04x (%s)\n", "checksum: 0x%04x eep_max: 0x%04x (%s)\n",
cksum, eep_max, cksum, eep_max,
eep_max == AR5K_EEPROM_INFO_MAX ? eep_max == AR5K_EEPROM_INFO_MAX ?
......
...@@ -1542,7 +1542,7 @@ int ath5k_hw_write_initvals(struct ath5k_hw *ah, u8 mode, bool skip_pcu) ...@@ -1542,7 +1542,7 @@ int ath5k_hw_write_initvals(struct ath5k_hw *ah, u8 mode, bool skip_pcu)
/* AR5K_MODE_11B */ /* AR5K_MODE_11B */
if (mode > 2) { if (mode > 2) {
ATH5K_ERR(ah->ah_sc, ATH5K_ERR(ah,
"unsupported channel mode: %d\n", mode); "unsupported channel mode: %d\n", mode);
return -EINVAL; return -EINVAL;
} }
......
...@@ -86,26 +86,26 @@ static DEFINE_PCI_DEVICE_TABLE(ath5k_led_devices) = { ...@@ -86,26 +86,26 @@ static DEFINE_PCI_DEVICE_TABLE(ath5k_led_devices) = {
{ } { }
}; };
void ath5k_led_enable(struct ath5k_softc *sc) void ath5k_led_enable(struct ath5k_hw *ah)
{ {
if (test_bit(ATH_STAT_LEDSOFT, sc->status)) { if (test_bit(ATH_STAT_LEDSOFT, ah->status)) {
ath5k_hw_set_gpio_output(sc->ah, sc->led_pin); ath5k_hw_set_gpio_output(ah, ah->led_pin);
ath5k_led_off(sc); ath5k_led_off(ah);
} }
} }
static void ath5k_led_on(struct ath5k_softc *sc) static void ath5k_led_on(struct ath5k_hw *ah)
{ {
if (!test_bit(ATH_STAT_LEDSOFT, sc->status)) if (!test_bit(ATH_STAT_LEDSOFT, ah->status))
return; return;
ath5k_hw_set_gpio(sc->ah, sc->led_pin, sc->led_on); ath5k_hw_set_gpio(ah, ah->led_pin, ah->led_on);
} }
void ath5k_led_off(struct ath5k_softc *sc) void ath5k_led_off(struct ath5k_hw *ah)
{ {
if (!test_bit(ATH_STAT_LEDSOFT, sc->status)) if (!test_bit(ATH_STAT_LEDSOFT, ah->status))
return; return;
ath5k_hw_set_gpio(sc->ah, sc->led_pin, !sc->led_on); ath5k_hw_set_gpio(ah, ah->led_pin, !ah->led_on);
} }
static void static void
...@@ -116,27 +116,27 @@ ath5k_led_brightness_set(struct led_classdev *led_dev, ...@@ -116,27 +116,27 @@ ath5k_led_brightness_set(struct led_classdev *led_dev,
led_dev); led_dev);
if (brightness == LED_OFF) if (brightness == LED_OFF)
ath5k_led_off(led->sc); ath5k_led_off(led->ah);
else else
ath5k_led_on(led->sc); ath5k_led_on(led->ah);
} }
static int static int
ath5k_register_led(struct ath5k_softc *sc, struct ath5k_led *led, ath5k_register_led(struct ath5k_hw *ah, struct ath5k_led *led,
const char *name, char *trigger) const char *name, char *trigger)
{ {
int err; int err;
led->sc = sc; led->ah = ah;
strncpy(led->name, name, sizeof(led->name)); strncpy(led->name, name, sizeof(led->name));
led->led_dev.name = led->name; led->led_dev.name = led->name;
led->led_dev.default_trigger = trigger; led->led_dev.default_trigger = trigger;
led->led_dev.brightness_set = ath5k_led_brightness_set; led->led_dev.brightness_set = ath5k_led_brightness_set;
err = led_classdev_register(sc->dev, &led->led_dev); err = led_classdev_register(ah->dev, &led->led_dev);
if (err) { if (err) {
ATH5K_WARN(sc, "could not register LED %s\n", name); ATH5K_WARN(ah, "could not register LED %s\n", name);
led->sc = NULL; led->ah = NULL;
} }
return err; return err;
} }
...@@ -144,30 +144,30 @@ ath5k_register_led(struct ath5k_softc *sc, struct ath5k_led *led, ...@@ -144,30 +144,30 @@ ath5k_register_led(struct ath5k_softc *sc, struct ath5k_led *led,
static void static void
ath5k_unregister_led(struct ath5k_led *led) ath5k_unregister_led(struct ath5k_led *led)
{ {
if (!led->sc) if (!led->ah)
return; return;
led_classdev_unregister(&led->led_dev); led_classdev_unregister(&led->led_dev);
ath5k_led_off(led->sc); ath5k_led_off(led->ah);
led->sc = NULL; led->ah = NULL;
} }
void ath5k_unregister_leds(struct ath5k_softc *sc) void ath5k_unregister_leds(struct ath5k_hw *ah)
{ {
ath5k_unregister_led(&sc->rx_led); ath5k_unregister_led(&ah->rx_led);
ath5k_unregister_led(&sc->tx_led); ath5k_unregister_led(&ah->tx_led);
} }
int __devinit ath5k_init_leds(struct ath5k_softc *sc) int __devinit ath5k_init_leds(struct ath5k_hw *ah)
{ {
int ret = 0; int ret = 0;
struct ieee80211_hw *hw = sc->hw; struct ieee80211_hw *hw = ah->hw;
#ifndef CONFIG_ATHEROS_AR231X #ifndef CONFIG_ATHEROS_AR231X
struct pci_dev *pdev = sc->pdev; struct pci_dev *pdev = ah->pdev;
#endif #endif
char name[ATH5K_LED_MAX_NAME_LEN + 1]; char name[ATH5K_LED_MAX_NAME_LEN + 1];
const struct pci_device_id *match; const struct pci_device_id *match;
if (!sc->pdev) if (!ah->pdev)
return 0; return 0;
#ifdef CONFIG_ATHEROS_AR231X #ifdef CONFIG_ATHEROS_AR231X
...@@ -176,24 +176,24 @@ int __devinit ath5k_init_leds(struct ath5k_softc *sc) ...@@ -176,24 +176,24 @@ int __devinit ath5k_init_leds(struct ath5k_softc *sc)
match = pci_match_id(&ath5k_led_devices[0], pdev); match = pci_match_id(&ath5k_led_devices[0], pdev);
#endif #endif
if (match) { if (match) {
__set_bit(ATH_STAT_LEDSOFT, sc->status); __set_bit(ATH_STAT_LEDSOFT, ah->status);
sc->led_pin = ATH_PIN(match->driver_data); ah->led_pin = ATH_PIN(match->driver_data);
sc->led_on = ATH_POLARITY(match->driver_data); ah->led_on = ATH_POLARITY(match->driver_data);
} }
if (!test_bit(ATH_STAT_LEDSOFT, sc->status)) if (!test_bit(ATH_STAT_LEDSOFT, ah->status))
goto out; goto out;
ath5k_led_enable(sc); ath5k_led_enable(ah);
snprintf(name, sizeof(name), "ath5k-%s::rx", wiphy_name(hw->wiphy)); snprintf(name, sizeof(name), "ath5k-%s::rx", wiphy_name(hw->wiphy));
ret = ath5k_register_led(sc, &sc->rx_led, name, ret = ath5k_register_led(ah, &ah->rx_led, name,
ieee80211_get_rx_led_name(hw)); ieee80211_get_rx_led_name(hw));
if (ret) if (ret)
goto out; goto out;
snprintf(name, sizeof(name), "ath5k-%s::tx", wiphy_name(hw->wiphy)); snprintf(name, sizeof(name), "ath5k-%s::tx", wiphy_name(hw->wiphy));
ret = ath5k_register_led(sc, &sc->tx_led, name, ret = ath5k_register_led(ah, &ah->tx_led, name,
ieee80211_get_tx_led_name(hw)); ieee80211_get_tx_led_name(hw));
out: out:
return ret; return ret;
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -187,7 +187,7 @@ int ath5k_hw_setup_tx_queue(struct ath5k_hw *ah, enum ath5k_tx_queue queue_type, ...@@ -187,7 +187,7 @@ int ath5k_hw_setup_tx_queue(struct ath5k_hw *ah, enum ath5k_tx_queue queue_type,
break; break;
case AR5K_TX_QUEUE_XR_DATA: case AR5K_TX_QUEUE_XR_DATA:
if (ah->ah_version != AR5K_AR5212) if (ah->ah_version != AR5K_AR5212)
ATH5K_ERR(ah->ah_sc, ATH5K_ERR(ah,
"XR data queues only supported in" "XR data queues only supported in"
" 5212!\n"); " 5212!\n");
queue = AR5K_TX_QUEUE_ID_XR_DATA; queue = AR5K_TX_QUEUE_ID_XR_DATA;
...@@ -510,7 +510,6 @@ int ath5k_hw_reset_tx_queue(struct ath5k_hw *ah, unsigned int queue) ...@@ -510,7 +510,6 @@ int ath5k_hw_reset_tx_queue(struct ath5k_hw *ah, unsigned int queue)
int ath5k_hw_set_ifs_intervals(struct ath5k_hw *ah, unsigned int slot_time) int ath5k_hw_set_ifs_intervals(struct ath5k_hw *ah, unsigned int slot_time)
{ {
struct ieee80211_channel *channel = ah->ah_current_channel; struct ieee80211_channel *channel = ah->ah_current_channel;
struct ath5k_softc *sc = ah->ah_sc;
struct ieee80211_rate *rate; struct ieee80211_rate *rate;
u32 ack_tx_time, eifs, eifs_clock, sifs, sifs_clock; u32 ack_tx_time, eifs, eifs_clock, sifs, sifs_clock;
u32 slot_time_clock = ath5k_hw_htoclock(ah, slot_time); u32 slot_time_clock = ath5k_hw_htoclock(ah, slot_time);
...@@ -546,9 +545,9 @@ int ath5k_hw_set_ifs_intervals(struct ath5k_hw *ah, unsigned int slot_time) ...@@ -546,9 +545,9 @@ int ath5k_hw_set_ifs_intervals(struct ath5k_hw *ah, unsigned int slot_time)
* Also we have different lowest rate for 802.11a * Also we have different lowest rate for 802.11a
*/ */
if (channel->hw_value & CHANNEL_5GHZ) if (channel->hw_value & CHANNEL_5GHZ)
rate = &sc->sbands[IEEE80211_BAND_5GHZ].bitrates[0]; rate = &ah->sbands[IEEE80211_BAND_5GHZ].bitrates[0];
else else
rate = &sc->sbands[IEEE80211_BAND_2GHZ].bitrates[0]; rate = &ah->sbands[IEEE80211_BAND_2GHZ].bitrates[0];
ack_tx_time = ath5k_hw_get_frame_duration(ah, 10, rate, false); ack_tx_time = ath5k_hw_get_frame_duration(ah, 10, rate, false);
...@@ -622,7 +621,7 @@ int ath5k_hw_init_queues(struct ath5k_hw *ah) ...@@ -622,7 +621,7 @@ int ath5k_hw_init_queues(struct ath5k_hw *ah)
for (i = 0; i < ah->ah_capabilities.cap_queues.q_tx_num; i++) { for (i = 0; i < ah->ah_capabilities.cap_queues.q_tx_num; i++) {
ret = ath5k_hw_reset_tx_queue(ah, i); ret = ath5k_hw_reset_tx_queue(ah, i);
if (ret) { if (ret) {
ATH5K_ERR(ah->ah_sc, ATH5K_ERR(ah,
"failed to reset TX queue #%d\n", i); "failed to reset TX queue #%d\n", i);
return ret; return ret;
} }
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment