Show
Ignore:
Timestamp:
02/06/06 21:20:57 (6 years ago)
Author:
mrenzmann
Message:

Yet another set of some minor code cleanup changes, again with no
functional changes.

Signed-off-by: Michael Renzmann <mrenzmann@otaku42.de>

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/ath/if_ath.c

    r1433 r1443  
    108108 
    109109static struct ieee80211vap *ath_vap_create(struct ieee80211com *, 
    110                        const char *name, int unit, int opmode, int flags, struct net_device *mdev); 
    111 static void    ath_vap_delete(struct ieee80211vap *); 
    112 static int     ath_init(struct net_device *); 
    113 static int     ath_reset(struct net_device *); 
    114 static void    ath_fatal_tasklet(TQUEUE_ARG); 
    115 static void    ath_rxorn_tasklet(TQUEUE_ARG); 
    116 static void    ath_bmiss_tasklet(TQUEUE_ARG); 
    117 static void    ath_bstuck_tasklet(TQUEUE_ARG); 
    118 static void    ath_radar_task(TQUEUE_ARG data); 
    119 static void    ath_dfs_test_return(unsigned long); 
    120  
    121 static int     ath_stop_locked(struct net_device *); 
    122 static int     ath_stop(struct net_device *); 
     110        const char *, int, int, int, struct net_device *); 
     111static void ath_vap_delete(struct ieee80211vap *); 
     112static int ath_init(struct net_device *); 
     113static int ath_reset(struct net_device *); 
     114static void ath_fatal_tasklet(TQUEUE_ARG); 
     115static void ath_rxorn_tasklet(TQUEUE_ARG); 
     116static void ath_bmiss_tasklet(TQUEUE_ARG); 
     117static void ath_bstuck_tasklet(TQUEUE_ARG); 
     118static void ath_radar_task(TQUEUE_ARG); 
     119static void ath_dfs_test_return(unsigned long); 
     120 
     121static int ath_stop_locked(struct net_device *); 
     122static int ath_stop(struct net_device *); 
    123123#if 0 
    124 static void     ath_initkeytable(struct ath_softc *); 
    125 #endif 
    126 static int      ath_key_alloc(struct ieee80211vap *, 
    127                         const struct ieee80211_key *); 
    128 static int      ath_key_delete(struct ieee80211vap *, 
    129                         const struct ieee80211_key *, 
    130                         struct ieee80211_node *); 
    131 static int      ath_key_set(struct ieee80211vap *, const struct ieee80211_key *, 
    132                         const u_int8_t mac[IEEE80211_ADDR_LEN]); 
    133 static void     ath_key_update_begin(struct ieee80211vap *); 
    134 static void     ath_key_update_end(struct ieee80211vap *); 
    135 static void     ath_mode_init(struct net_device *); 
    136 static void     ath_setslottime(struct ath_softc *); 
    137 static void     ath_updateslot(struct net_device *); 
    138 static int      ath_beaconq_setup(struct ath_hal *); 
    139 static int      ath_beacon_alloc(struct ath_softc *, struct ieee80211_node *); 
     124static void ath_initkeytable(struct ath_softc *); 
     125#endif 
     126static int ath_key_alloc(struct ieee80211vap *, const struct ieee80211_key *); 
     127static int ath_key_delete(struct ieee80211vap *, const struct ieee80211_key *, 
     128        struct ieee80211_node *); 
     129static int ath_key_set(struct ieee80211vap *, const struct ieee80211_key *, 
     130        const u_int8_t mac[IEEE80211_ADDR_LEN]); 
     131static void ath_key_update_begin(struct ieee80211vap *); 
     132static void ath_key_update_end(struct ieee80211vap *); 
     133static void ath_mode_init(struct net_device *); 
     134static void ath_setslottime(struct ath_softc *); 
     135static void ath_updateslot(struct net_device *); 
     136static int ath_beaconq_setup(struct ath_hal *); 
     137static int ath_beacon_alloc(struct ath_softc *, struct ieee80211_node *); 
    140138#ifdef ATH_SUPERG_DYNTURBO 
    141 static void    ath_beacon_dturbo_update(struct ieee80211vap *vap, int *, u_int8_t); 
    142 static void    ath_beacon_dturbo_config(struct ieee80211vap *, u_int32_t); 
    143 static void    ath_turbo_switch_mode(unsigned long); 
    144 static int     ath_check_beacon_done(struct ath_softc *sc); 
    145 #endif 
    146 static void    ath_beacon_send(struct ath_softc *, int *needmark); 
    147 static void    ath_beacon_start_adhoc(struct ath_softc *, 
    148                        struct ieee80211vap *); 
    149 static void    ath_beacon_return(struct ath_softc *, struct ath_buf *); 
    150 static void    ath_beacon_free(struct ath_softc *); 
    151 static void    ath_beacon_config(struct ath_softc *, struct ieee80211vap *); 
    152 static int     ath_desc_alloc(struct ath_softc *); 
    153 static void    ath_desc_free(struct ath_softc *); 
    154 static void    ath_desc_swap(struct ath_desc *); 
    155 static struct ieee80211_node *ath_node_alloc(struct ieee80211_node_table *, struct ieee80211vap *vap); 
    156 static void    ath_node_cleanup(struct ieee80211_node *); 
    157 static void    ath_node_free(struct ieee80211_node *); 
    158 static u_int8_t        ath_node_getrssi(const struct ieee80211_node *); 
    159 static int     ath_rxbuf_init(struct ath_softc *, struct ath_buf *); 
    160 static void    ath_recv_mgmt(struct ieee80211_node *, struct sk_buff *, 
    161                        int subtype, int rssi, u_int32_t rstamp); 
    162 static void    ath_setdefantenna(struct ath_softc *sc, u_int antenna); 
    163 static struct ath_txq *ath_txq_setup(struct ath_softc*, int qtype, int subtype); 
    164 static void    ath_rx_tasklet(TQUEUE_ARG data); 
    165 static int     ath_hardstart(struct sk_buff *, struct net_device *); 
    166 static int     ath_mgtstart(struct ieee80211com *ic, struct sk_buff *skb); 
     139static void ath_beacon_dturbo_update(struct ieee80211vap *, int *, u_int8_t); 
     140static void ath_beacon_dturbo_config(struct ieee80211vap *, u_int32_t); 
     141static void ath_turbo_switch_mode(unsigned long); 
     142static int ath_check_beacon_done(struct ath_softc *); 
     143#endif 
     144static void ath_beacon_send(struct ath_softc *, int *); 
     145static void ath_beacon_start_adhoc(struct ath_softc *, struct ieee80211vap *); 
     146static void ath_beacon_return(struct ath_softc *, struct ath_buf *); 
     147static void ath_beacon_free(struct ath_softc *); 
     148static void ath_beacon_config(struct ath_softc *, struct ieee80211vap *); 
     149static int ath_desc_alloc(struct ath_softc *); 
     150static void ath_desc_free(struct ath_softc *); 
     151static void ath_desc_swap(struct ath_desc *); 
     152static struct ieee80211_node *ath_node_alloc(struct ieee80211_node_table *, 
     153       struct ieee80211vap *); 
     154static void ath_node_cleanup(struct ieee80211_node *); 
     155static void ath_node_free(struct ieee80211_node *); 
     156static u_int8_t ath_node_getrssi(const struct ieee80211_node *); 
     157static int ath_rxbuf_init(struct ath_softc *, struct ath_buf *); 
     158static void ath_recv_mgmt(struct ieee80211_node *, struct sk_buff *, int, 
     159        int, u_int32_t); 
     160static void ath_setdefantenna(struct ath_softc *, u_int); 
     161static struct ath_txq *ath_txq_setup(struct ath_softc *, int, int); 
     162static void ath_rx_tasklet(TQUEUE_ARG); 
     163static int ath_hardstart(struct sk_buff *, struct net_device *); 
     164static int ath_mgtstart(struct ieee80211com *, struct sk_buff *); 
    167165#ifdef ATH_SUPERG_COMP 
    168 static u_int32_t ath_get_icvlen(struct ieee80211_key *k); 
    169 static u_int32_t ath_get_ivlen(struct ieee80211_key *k); 
    170 static void     ath_setup_comp(struct ieee80211_node *, int); 
    171 static void     ath_comp_set(struct ieee80211vap *, struct ieee80211_node *ni, 
    172                                 int en);         
    173 #endif 
    174 static int      ath_tx_setup(struct ath_softc *, int ac, int haltype); 
    175 static int      ath_wme_update(struct ieee80211com *); 
    176 static void     ath_uapsd_flush(struct ieee80211_node *); 
    177 static void     ath_tx_cleanupq(struct ath_softc *, struct ath_txq *); 
    178 static void     ath_tx_cleanup(struct ath_softc *); 
    179 static void     ath_tx_uapsdqueue(struct ath_softc *, struct ath_node *, struct ath_buf *); 
    180  
    181 static int      ath_tx_start(struct net_device *, struct ieee80211_node *, 
    182                              struct ath_buf *, struct sk_buff *, int); 
    183 static void     ath_tx_tasklet_q0(TQUEUE_ARG data); 
    184 static void     ath_tx_tasklet_q0123(TQUEUE_ARG data); 
    185 static void     ath_tx_tasklet(TQUEUE_ARG data); 
    186 static void     ath_tx_timeout(struct net_device *); 
    187 static void     ath_tx_draintxq(struct ath_softc *, struct ath_txq *); 
    188 static int      ath_chan_set(struct ath_softc *, struct ieee80211_channel *); 
    189 static void     ath_draintxq(struct ath_softc *); 
    190 static __inline void ath_tx_txqaddbuf(struct ath_softc *sc, struct ieee80211_node *ni,  
    191                                     struct ath_txq *txq, struct ath_buf *bf,  
    192                                     struct ath_desc *lastds, int framelen); 
    193 static void     ath_stoprecv(struct ath_softc *); 
    194 static int      ath_startrecv(struct ath_softc *); 
    195 static void     ath_flushrecv(struct ath_softc *); 
    196 static void     ath_chan_change(struct ath_softc *, struct ieee80211_channel *); 
    197 static void     ath_calibrate(unsigned long); 
    198 static int      ath_newstate(struct ieee80211vap *, enum ieee80211_state, int); 
    199  
    200 static void     ath_scan_start(struct ieee80211com *); 
    201 static void     ath_scan_end(struct ieee80211com *); 
    202 static void     ath_set_channel(struct ieee80211com *); 
    203 static void     ath_set_coverageclass(struct ieee80211com *); 
    204 static u_int    ath_mhz2ieee(struct ieee80211com *, u_int freq, u_int flags); 
     166static u_int32_t ath_get_icvlen(struct ieee80211_key *); 
     167static u_int32_t ath_get_ivlen(struct ieee80211_key *); 
     168static void ath_setup_comp(struct ieee80211_node *, int); 
     169static void ath_comp_set(struct ieee80211vap *, struct ieee80211_node *, int);   
     170#endif 
     171static int ath_tx_setup(struct ath_softc *, int, int); 
     172static int ath_wme_update(struct ieee80211com *); 
     173static void ath_uapsd_flush(struct ieee80211_node *); 
     174static void ath_tx_cleanupq(struct ath_softc *, struct ath_txq *); 
     175static void ath_tx_cleanup(struct ath_softc *); 
     176static void ath_tx_uapsdqueue(struct ath_softc *, struct ath_node *, 
     177        struct ath_buf *); 
     178 
     179static int ath_tx_start(struct net_device *, struct ieee80211_node *, 
     180        struct ath_buf *, struct sk_buff *, int); 
     181static void ath_tx_tasklet_q0(TQUEUE_ARG); 
     182static void ath_tx_tasklet_q0123(TQUEUE_ARG); 
     183static void ath_tx_tasklet(TQUEUE_ARG); 
     184static void ath_tx_timeout(struct net_device *); 
     185static void ath_tx_draintxq(struct ath_softc *, struct ath_txq *); 
     186static int ath_chan_set(struct ath_softc *, struct ieee80211_channel *); 
     187static void ath_draintxq(struct ath_softc *); 
     188static __inline void ath_tx_txqaddbuf(struct ath_softc *, struct ieee80211_node *, 
     189        struct ath_txq *, struct ath_buf *, struct ath_desc *, int); 
     190static void ath_stoprecv(struct ath_softc *); 
     191static int ath_startrecv(struct ath_softc *); 
     192static void ath_flushrecv(struct ath_softc *); 
     193static void ath_chan_change(struct ath_softc *, struct ieee80211_channel *); 
     194static void ath_calibrate(unsigned long); 
     195static int ath_newstate(struct ieee80211vap *, enum ieee80211_state, int); 
     196 
     197static void ath_scan_start(struct ieee80211com *); 
     198static void ath_scan_end(struct ieee80211com *); 
     199static void ath_set_channel(struct ieee80211com *); 
     200static void ath_set_coverageclass(struct ieee80211com *); 
     201static u_int ath_mhz2ieee(struct ieee80211com *, u_int, u_int); 
    205202#ifdef ATH_SUPERG_FF 
    206 static int     athff_can_aggregate(struct ath_softc *sc, struct ether_header *eh, 
    207                                    struct ath_node *an, struct sk_buff *skb, u_int16_t fragthreshold, int *flushq); 
     203static int athff_can_aggregate(struct ath_softc *, struct ether_header *, 
     204        struct ath_node *, struct sk_buff *, u_int16_t, int *); 
    208205#endif 
    209206static struct net_device_stats *ath_getstats(struct net_device *); 
    210 static void     ath_setup_stationkey(struct ieee80211_node *); 
    211 static void     ath_setup_stationwepkey(struct ieee80211_node *); 
    212 static void     ath_setup_keycacheslot(struct ath_softc *, 
    213                         struct ieee80211_node *); 
    214 static void     ath_newassoc(struct ieee80211_node *, int); 
    215 static int      ath_getchannels(struct net_device *, u_int cc, 
    216                         HAL_BOOL outdoor, HAL_BOOL xchanmode); 
    217 static void     ath_led_event(struct ath_softc *, int); 
    218 static void     ath_update_txpow(struct ath_softc *); 
    219  
    220 static int      ath_set_mac_address(struct net_device *, void *); 
    221 static int      ath_change_mtu(struct net_device *, int); 
    222 static int      ath_ioctl(struct net_device *, struct ifreq *, int); 
    223  
    224 static int      ath_rate_setup(struct net_device *, u_int mode); 
    225 static void     ath_setup_subrates(struct net_device *dev); 
     207static void ath_setup_stationkey(struct ieee80211_node *); 
     208static void ath_setup_stationwepkey(struct ieee80211_node *); 
     209static void ath_setup_keycacheslot(struct ath_softc *, struct ieee80211_node *); 
     210static void ath_newassoc(struct ieee80211_node *, int); 
     211static int ath_getchannels(struct net_device *, u_int, HAL_BOOL, HAL_BOOL); 
     212static void ath_led_event(struct ath_softc *, int); 
     213static void ath_update_txpow(struct ath_softc *); 
     214 
     215static int ath_set_mac_address(struct net_device *, void *); 
     216static int ath_change_mtu(struct net_device *, int); 
     217static int ath_ioctl(struct net_device *, struct ifreq *, int); 
     218 
     219static int ath_rate_setup(struct net_device *, u_int); 
     220static void ath_setup_subrates(struct net_device *); 
    226221#ifdef ATH_SUPERG_XR 
    227 static int     ath_xr_rate_setup(struct net_device *); 
    228 static void    ath_grppoll_txq_setup(struct ath_softc *sc, int qtype, int period); 
    229 static void    ath_grppoll_start(struct ieee80211vap *vap, int pollcount); 
    230 static void    ath_grppoll_stop(struct ieee80211vap *vap); 
    231 static u_int8_t        ath_node_move_data(const struct ieee80211_node *); 
    232 static void    ath_grppoll_txq_update(struct ath_softc *sc, int period); 
    233 static void    ath_grppoll_period_update(struct ath_softc *sc); 
    234 #endif 
    235 static void    ath_setcurmode(struct ath_softc *, enum ieee80211_phymode); 
     222static int ath_xr_rate_setup(struct net_device *); 
     223static void ath_grppoll_txq_setup(struct ath_softc *, int, int); 
     224static void ath_grppoll_start(struct ieee80211vap *, int); 
     225static void ath_grppoll_stop(struct ieee80211vap *); 
     226static u_int8_t ath_node_move_data(const struct ieee80211_node *); 
     227static void ath_grppoll_txq_update(struct ath_softc *, int); 
     228static void ath_grppoll_period_update(struct ath_softc *); 
     229#endif 
     230static void ath_setcurmode(struct ath_softc *, enum ieee80211_phymode); 
    236231 
    237232#ifdef CONFIG_SYSCTL 
    238 static void    ath_dynamic_sysctl_register(struct ath_softc *); 
    239 static void    ath_dynamic_sysctl_unregister(struct ath_softc *); 
     233static void ath_dynamic_sysctl_register(struct ath_softc *); 
     234static void ath_dynamic_sysctl_unregister(struct ath_softc *); 
    240235#endif /* CONFIG_SYSCTL */ 
    241 static void     ath_announce(struct net_device *); 
    242 static int      ath_descdma_setup(struct ath_softc *sc, 
    243                                  struct ath_descdma *dd, ath_bufhead *head, 
    244                                  const char *name, int nbuf, int ndesc); 
    245 static void     ath_descdma_cleanup(struct ath_softc *sc, 
    246                                 struct ath_descdma *dd, ath_bufhead *head, int dir); 
    247 static void     ath_check_dfs_clear(unsigned long ); 
    248 static const char* ath_get_hal_status_desc(HAL_STATUS status); 
     236static void ath_announce(struct net_device *); 
     237static int ath_descdma_setup(struct ath_softc *, struct ath_descdma *, 
     238        ath_bufhead *, const char *, int, int); 
     239static void ath_descdma_cleanup(struct ath_softc *, struct ath_descdma *, 
     240        ath_bufhead *, int); 
     241static void ath_check_dfs_clear(unsigned long); 
     242static const char *ath_get_hal_status_desc(HAL_STATUS status); 
    249243static int ath_rcv_dev_event(struct notifier_block *, unsigned long, void *); 
    250244         
    251 static int     ath_calinterval = ATH_SHORT_CALINTERVAL;               /* 
     245static int ath_calinterval = ATH_SHORT_CALINTERVAL;           /* 
    252246                                                                 * calibrate every 30 secs in steady state 
    253247                                                                 * but check every second at first. 
    254248                                                                 */ 
    255 static int ath_countrycode = CTRY_DEFAULT;    /* country code */ 
    256 static int ath_regdomain = 0;                 /* regulatory domain */ 
    257 static int ath_outdoor = AH_FALSE;            /* enable outdoor use */ 
    258 static int ath_xchanmode = AH_TRUE;           /* enable extended channels */ 
    259 static char *autocreate = NULL; 
    260 static int rfkill = -1; 
    261 static int countrycode = -1; 
    262 static int outdoor = -1; 
    263 static int xchanmode = -1; 
     249static int ath_countrycode = CTRY_DEFAULT;    /* country code */ 
     250static int ath_regdomain = 0;                 /* regulatory domain */ 
     251static int ath_outdoor = AH_FALSE;            /* enable outdoor use */ 
     252static int ath_xchanmode = AH_TRUE;           /* enable extended channels */ 
     253static char *autocreate = NULL; 
     254static int rfkill = -1; 
     255static int countrycode = -1; 
     256static int outdoor = -1; 
     257static int xchanmode = -1; 
    264258 
    265259static const char *hal_status_desc[] = { 
    …… 
    317311#define IFF_DUMPPKTS(sc, _m) \ 
    318312        ((sc->sc_debug & _m)) 
    319 static void ath_printrxbuf(struct ath_buf *bf, int); 
    320 static void ath_printtxbuf(struct ath_buf *bf, int); 
     313static void ath_printrxbuf(struct ath_buf *, int); 
     314static void ath_printtxbuf(struct ath_buf *, int); 
    321315enum { 
    322316        ATH_DEBUG_XMIT          = 0x00000001,   /* basic xmit operation */