Thread: [Madwifi-cvs] revision 1776 committed
Status: Beta
Brought to you by:
otaku
From: David K. <svn...@ma...> - 2006-10-25 16:24:10
|
Project : madwifi Revision : 1776 Author : dwhedon (David Kimdon) Date : 2006-10-25 18:23:57 +0200 (Wed, 25 Oct 2006) Log Message : Adjust names and formatting of additiosn to struct ath_softc to conform to local convention. * ath/if_athvar.h (struct ath_softc) : hw_conf, hw_modes, channels, rates renamed to sc_hw_conf, sc_hw_modes, sc_channels, sc_ieee80211_rates respectively. Fix indentation of sc_ieee80211_channel and sc_dev_open. * ath/if_ath_d80211.c : Adapt to new names. Affected Files: * branches/dadwifi/ath/if_ath_d80211.c updated * branches/dadwifi/ath/if_athvar.h updated Modified: branches/dadwifi/ath/if_ath_d80211.c =================================================================== --- branches/dadwifi/ath/if_ath_d80211.c 2006-10-25 16:08:35 UTC (rev 1775) +++ branches/dadwifi/ath/if_ath_d80211.c 2006-10-25 16:23:57 UTC (rev 1776) @@ -105,22 +105,22 @@ struct ieee80211_hw_modes *mode; int i; - for (i = 0; i < sc->hw_conf.num_modes ; i++) { - if (sc->hw_modes[i].mode == hw_mode) + for (i = 0; i < sc->sc_hw_conf.num_modes ; i++) { + if (sc->sc_hw_modes[i].mode == hw_mode) break; } - if (i == sc->hw_conf.num_modes) { - if (sc->hw_conf.num_modes == ATH_MAX_HW_MODES) { + if (i == sc->sc_hw_conf.num_modes) { + if (sc->sc_hw_conf.num_modes == ATH_MAX_HW_MODES) { DPRINTF(sc, ATH_DEBUG_ANY, "%s: no free mode elements\n", __func__); return -1; } - mode = &sc->hw_modes[sc->hw_conf.num_modes]; + mode = &sc->sc_hw_modes[sc->sc_hw_conf.num_modes]; mode->mode = hw_mode; - sc->hw_conf.num_modes++; + sc->sc_hw_conf.num_modes++; } else { - mode = &sc->hw_modes[i]; + mode = &sc->sc_hw_modes[i]; } DPRINTF(sc, ATH_DEBUG_D80211, "%s: hal_chan %x hal_flags %x\n", __func__, @@ -181,19 +181,19 @@ hw_mode = ath_hal_mode_to_d80211_mode(hal_mode); - for (i = 0; i < sc->hw_conf.num_modes ; i++) { - if (sc->hw_modes[i].mode == hw_mode) + for (i = 0; i < sc->sc_hw_conf.num_modes ; i++) { + if (sc->sc_hw_modes[i].mode == hw_mode) break; } - if (i == sc->hw_conf.num_modes) { + if (i == sc->sc_hw_conf.num_modes) { printk(KERN_ERR "cannot find mode element.\n"); return -1; } DPRINTF(sc, ATH_DEBUG_D80211, "%s: hal_mode %x\n", __func__, hal_mode); - mode = &sc->hw_modes[i]; + mode = &sc->sc_hw_modes[i]; mode->num_rates = 0; rates = mode->rates; @@ -655,20 +655,20 @@ void ath_d80211_init_softc(struct ath_softc *sc) { - struct ieee80211_hw *hw = &sc->hw_conf; + struct ieee80211_hw *hw = &sc->sc_hw_conf; int i; DPRINTF(sc, ATH_DEBUG_D80211, "%s\n", __func__); memcpy(hw, &ath_d80211_hw, sizeof(ath_d80211_hw)); - hw->modes = &sc->hw_modes[0]; + hw->modes = &sc->sc_hw_modes[0]; for (i = 0; i < ATH_MAX_HW_MODES; i++) { hw->modes[i].num_channels = 0; - hw->modes[i].channels = &sc->channels[i * ATH_MAX_CHANNELS]; + hw->modes[i].channels = &sc->sc_channels[i * ATH_MAX_CHANNELS]; hw->modes[i].num_rates = 0; - hw->modes[i].rates = &sc->rates[i * ATH_MAX_RATES]; + hw->modes[i].rates = &sc->sc_ieee80211_rates[i * ATH_MAX_RATES]; } sc->sc_opmode = HAL_M_STA; @@ -680,7 +680,7 @@ ath_d80211_attach(struct net_device *dev) { struct ath_softc *sc = ieee80211_dev_hw_data(dev); - struct ieee80211_hw *hw = &sc->hw_conf; + struct ieee80211_hw *hw = &sc->sc_hw_conf; int rv = 0; DPRINTF(sc, ATH_DEBUG_D80211, "%s\n", __func__); Modified: branches/dadwifi/ath/if_athvar.h =================================================================== --- branches/dadwifi/ath/if_athvar.h 2006-10-25 16:08:35 UTC (rev 1775) +++ branches/dadwifi/ath/if_athvar.h 2006-10-25 16:23:57 UTC (rev 1776) @@ -701,13 +701,14 @@ #define ATH_MAX_HW_MODES 5 #define ATH_MAX_CHANNELS 64 #define ATH_MAX_RATES 16 - struct ieee80211_hw hw_conf; - struct ieee80211_hw_modes hw_modes[ATH_MAX_HW_MODES]; - struct ieee80211_channel channels[ATH_MAX_HW_MODES * - ATH_MAX_CHANNELS]; - struct ieee80211_rate rates[ATH_MAX_HW_MODES * ATH_MAX_RATES]; - int sc_ieee80211_channel; - int sc_dev_open; + struct ieee80211_hw sc_hw_conf; + struct ieee80211_hw_modes sc_hw_modes[ATH_MAX_HW_MODES]; + struct ieee80211_channel sc_channels[ATH_MAX_HW_MODES * + ATH_MAX_CHANNELS]; + struct ieee80211_rate sc_ieee80211_rates[ATH_MAX_HW_MODES * + ATH_MAX_RATES]; + int sc_ieee80211_channel; + int sc_dev_open; int sc_num_alloced_bss; /* total # of elements in sc_bss */ spinlock_t sc_bss_lock; /* for access to sc_num_bss, sc_bss */ int sc_num_bss; /* # of used elements in sc_bss */ |