Thread: [Madwifi-cvs] madwifi/ath if_ath.c,1.23,1.24
Status: Beta
Brought to you by:
otaku
From: Sam L. <sam...@us...> - 2004-10-08 15:38:56
|
Update of /cvsroot/madwifi/madwifi/ath In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28583 Modified Files: if_ath.c Log Message: Correct ath_chan2flags' handling of turbo mode by adding an entry to the mapping table. While we're here add assertions to catch similar problems. Submitted by: kaleda <gadeanta at soften.ktu.lt> Index: if_ath.c =================================================================== RCS file: /cvsroot/madwifi/madwifi/ath/if_ath.c,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** if_ath.c 6 Oct 2004 17:07:06 -0000 1.23 --- if_ath.c 8 Oct 2004 15:38:44 -0000 1.24 *************** *** 770,773 **** --- 770,774 ---- ath_chan2flags(struct ieee80211com *ic, struct ieee80211_channel *chan) { + #define N(a) (sizeof(a) / sizeof(a[0])) static const u_int modeflags[] = { 0, /* IEEE80211_MODE_AUTO */ *************** *** 775,781 **** CHANNEL_B, /* IEEE80211_MODE_11B */ CHANNEL_PUREG, /* IEEE80211_MODE_11G */ CHANNEL_T /* IEEE80211_MODE_TURBO */ }; ! return modeflags[ieee80211_chan2mode(ic, chan)]; } --- 776,788 ---- CHANNEL_B, /* IEEE80211_MODE_11B */ CHANNEL_PUREG, /* IEEE80211_MODE_11G */ + 0, /* IEEE80211_MODE_FH */ CHANNEL_T /* IEEE80211_MODE_TURBO */ }; ! enum ieee80211_phymode mode = ieee80211_chan2mode(ic, chan); ! ! KASSERT(mode < N(modeflags), ("unexpected phy mode %u", mode)); ! KASSERT(modeflags[mode] != 0, ("mode %u undefined", mode)); ! return modeflags[mode]; ! #undef N } |