iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ath5k: fix build break from "ath5k: Print out opmode in debugfs"

Browse Source 
Also improve ath_opmode_to_string usage by having it return UNKNOWN
rather than NULL in the event of failure to map the opmode value to a
representative string.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Joe Perches 2010-10-12 11:07:44 -07:00 committed by John W. Linville
parent cfd8e12f42
commit 908ebfb95d
4 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/wireless/ath/ath5k/base.c
View File

@ -563,9 +563,7 @@ static void ath_do_set_opmode(struct ath5k_softc *sc)
struct ath5k_hw *ah = sc->ah; struct ath5k_hw *ah = sc->ah;
ath5k_hw_set_opmode(ah, sc->opmode); ath5k_hw_set_opmode(ah, sc->opmode);
ATH5K_DBG(sc, ATH5K_DEBUG_MODE, "mode setup opmode %d (%s)\n", ATH5K_DBG(sc, ATH5K_DEBUG_MODE, "mode setup opmode %d (%s)\n",
sc->opmode, sc->opmode, ath_opmode_to_string(sc->opmode));
ath_opmode_to_string(sc->opmode) ?
ath_opmode_to_string(sc->opmode) : "UKNOWN");
} }
void ath5k_update_bssid_mask_and_opmode(struct ath5k_softc *sc, void ath5k_update_bssid_mask_and_opmode(struct ath5k_softc *sc,

14
drivers/net/wireless/ath/ath5k/debug.c
View File

@ -493,7 +493,6 @@ static ssize_t read_file_misc(struct file *file, char __user *user_buf,
char buf[700]; char buf[700];
unsigned int len = 0; unsigned int len = 0;
u32 filt = ath5k_hw_get_rx_filter(sc->ah); u32 filt = ath5k_hw_get_rx_filter(sc->ah);
const char *tmp;
len += snprintf(buf+len, sizeof(buf)-len, "bssid-mask: %pM\n", len += snprintf(buf+len, sizeof(buf)-len, "bssid-mask: %pM\n",
sc->bssidmask); sc->bssidmask);
@ -522,17 +521,10 @@ static ssize_t read_file_misc(struct file *file, char __user *user_buf,
if (filt & AR5K_RX_FILTER_PHYERR_5211) if (filt & AR5K_RX_FILTER_PHYERR_5211)
snprintf(buf+len, sizeof(buf)-len, " PHYERR-5211"); snprintf(buf+len, sizeof(buf)-len, " PHYERR-5211");
if (filt & AR5K_RX_FILTER_RADARERR_5211) if (filt & AR5K_RX_FILTER_RADARERR_5211)
len += snprintf(buf+len, sizeof(buf)-len, " RADARERR-5211\n"); len += snprintf(buf+len, sizeof(buf)-len, " RADARERR-5211");
else
len += snprintf(buf+len, sizeof(buf)-len, "\n");
tmp = ath_opmode_to_string(sc->opmode); len += snprintf(buf+len, sizeof(buf)-len, "\nopmode: %s (%d)\n",
if (tmp) ath_opmode_to_string(sc->opmode), sc->opmode);
len += snprintf(buf+len, sizeof(buf)-len, "opmode: %s\n",
tmp);
else
len += snprintf(buf+len, sizeof(buf)-len,
"opmode: UNKNOWN-%i\n", sc->opmode);
if (len > sizeof(buf)) if (len > sizeof(buf))
len = sizeof(buf); len = sizeof(buf);

2
drivers/net/wireless/ath/debug.c
View File

@ -55,7 +55,7 @@ const char *ath_opmode_to_string(enum nl80211_iftype opmode)
case NL80211_IFTYPE_P2P_GO: case NL80211_IFTYPE_P2P_GO:
return "P2P-GO"; return "P2P-GO";
default: default:
return NULL; return "UNKNOWN";
} }
} }
EXPORT_SYMBOL(ath_opmode_to_string); EXPORT_SYMBOL(ath_opmode_to_string);

7
drivers/net/wireless/ath/debug.h
View File

@ -78,6 +78,13 @@ ath_print(struct ath_common *common, int dbg_mask, const char *fmt, ...)
#endif /* CONFIG_ATH_DEBUG */ #endif /* CONFIG_ATH_DEBUG */
/** Returns string describing opmode, or NULL if unknown mode. */ /** Returns string describing opmode, or NULL if unknown mode. */
#ifdef CONFIG_ATH_DEBUG
const char *ath_opmode_to_string(enum nl80211_iftype opmode); const char *ath_opmode_to_string(enum nl80211_iftype opmode);
#else
static inline const char *ath_opmode_to_string(enum nl80211_iftype opmode)
{
return "UNKNOWN";
}
#endif
#endif /* ATH_DEBUG_H */ #endif /* ATH_DEBUG_H */