Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 931be260 authored by Pavel Roskin's avatar Pavel Roskin Committed by John W. Linville
Browse files

ath5k: clean up base.h and its use 



Remove unnecessary includes from base.h.  Add includes to other files as
necessary.  Don't include base.h unless needed.

Move declarations for functions in base.c from ath5k.h to base.h.

Use a better named define to protect base.h against double inclusion.

Signed-off-by: default avatarPavel Roskin <proski@gnu.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent d601d9ca

drivers/net/wireless/ath/ath5k/ani.c

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
 */



#include "ath5k.h"

#include "base.h"

#include "reg.h"

#include "debug.h"

#include "ani.h"

drivers/net/wireless/ath/ath5k/ani.h

+4 −0
Original line number Diff line number Diff line
@@ -16,6 +16,10 @@ 
#ifndef ANI_H

#define ANI_H



#include "../ath.h"



enum ath5k_phy_error_code;



/* these thresholds are relative to the ATH5K_ANI_LISTEN_PERIOD */

#define ATH5K_ANI_LISTEN_PERIOD		100

#define ATH5K_ANI_OFDM_TRIG_HIGH	500

drivers/net/wireless/ath/ath5k/ath5k.h

+0 −34
Original line number Diff line number Diff line
@@ -287,17 +287,6 @@ enum ath5k_radio { 
 * Common silicon revision/version values

 */



enum ath5k_srev_type {

	AR5K_VERSION_MAC,

	AR5K_VERSION_RAD,

};



struct ath5k_srev_name {

	const char		*sr_name;

	enum ath5k_srev_type	sr_type;

	u_int			sr_val;

};



#define AR5K_SREV_UNKNOWN	0xffff



#define AR5K_SREV_AR5210	0x00 /* Crete */
@@ -1271,36 +1260,13 @@ struct ath_bus_ops { 
extern const struct ieee80211_ops ath5k_hw_ops;



/* Initialization and detach functions */

int ath5k_init_softc(struct ath5k_hw *ah, const struct ath_bus_ops *bus_ops);

void ath5k_deinit_softc(struct ath5k_hw *ah);

int ath5k_hw_init(struct ath5k_hw *ah);

void ath5k_hw_deinit(struct ath5k_hw *ah);



int ath5k_sysfs_register(struct ath5k_hw *ah);

void ath5k_sysfs_unregister(struct ath5k_hw *ah);



/* base.c */

struct ath5k_buf;

struct ath5k_txq;



void ath5k_set_beacon_filter(struct ieee80211_hw *hw, bool enable);

bool ath5k_any_vif_assoc(struct ath5k_hw *ah);

void ath5k_tx_queue(struct ieee80211_hw *hw, struct sk_buff *skb,

		    struct ath5k_txq *txq);

int ath5k_start(struct ieee80211_hw *hw);

void ath5k_stop(struct ieee80211_hw *hw);

void ath5k_mode_setup(struct ath5k_hw *ah, struct ieee80211_vif *vif);

void ath5k_update_bssid_mask_and_opmode(struct ath5k_hw *ah,

					struct ieee80211_vif *vif);

int ath5k_chan_set(struct ath5k_hw *ah, struct ieee80211_channel *chan);

void ath5k_beacon_update_timers(struct ath5k_hw *ah, u64 bc_tsf);

int ath5k_beacon_update(struct ieee80211_hw *hw, struct ieee80211_vif *vif);

void ath5k_beacon_config(struct ath5k_hw *ah);

void ath5k_txbuf_free_skb(struct ath5k_hw *ah, struct ath5k_buf *bf);

void ath5k_rxbuf_free_skb(struct ath5k_hw *ah, struct ath5k_buf *bf);



/*Chip id helper functions */

const char *ath5k_chip_name(enum ath5k_srev_type type, u_int16_t val);

int ath5k_hw_read_srev(struct ath5k_hw *ah);



/* LED functions */

drivers/net/wireless/ath/ath5k/attach.c

+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ 
#include "ath5k.h"

#include "reg.h"

#include "debug.h"

#include "base.h"



/**

 * ath5k_hw_post - Power On Self Test helper function

drivers/net/wireless/ath/ath5k/base.c

+3 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ 
#include <linux/uaccess.h>

#include <linux/slab.h>

#include <linux/etherdevice.h>

#include <linux/nl80211.h>



#include <net/ieee80211_radiotap.h>
@@ -61,6 +62,8 @@ 
#include "reg.h"

#include "debug.h"

#include "ani.h"

#include "ath5k.h"

#include "../regd.h"



#define CREATE_TRACE_POINTS

#include "trace.h"