On Wed, 2014-02-05 at 19:44 -0600, Calvin Owens wrote:
> Create a function to return a descriptive string for each reason code,
> and print that instead of the numeric value in the kernel log. These
> codes are easily found on popular search engines, but one is generally
> not able to access the internet when dealing with wireless connectivity
> issues.
Hello Calvin.
Some suggestions below...
> diff --git a/net/mac80211/main.c b/net/mac80211/main.c
[]
> @@ -743,6 +743,72 @@ static int ieee80211_init_cipher_suites(struct
> ieee80211_local *local)
> return 0;
> }
>
> +static const char *reason_code_strings[49] = {
static const char * const reason_etc...
> + "(RESERVED)",
> + "UNSPECIFIED",
etc..., but perhaps this thing below is fragile.
> +const char *ieee80211_get_reason_code_string(u16 reason_code)
> +{
> + if (reason_code <= 24)
> + return reason_code_strings[reason_code];
> + else if (reason_code >= 32 && reason_code <= 39)
> + return reason_code_strings[reason_code - 7];
> + else if (reason_code == 45)
> + return reason_code_strings[33];
> + else if (reason_code >= 52 && reason_code <= 66)
> + return reason_code_strings[reason_code - 18];
> + else
> + return "(INVALID)";
> +}
Perhaps use a more common kernel style
struct ieee80211_reason_descriptions {
u16 code;
const char * desc;
}
and enumerate the reason codes with #defines and use a
macro to populate the descriptions
#define IEEE80211_REASON_RESERVED 0
#define IEEE80211_REASON_UNSPECIFIED 1
etc.
#define POPULATE_IEEE_REASON(code) \
{.code = IEEE80211_REASON_##code, .desc = #code}
static const struct ieee80211_reason_descriptions reasons[] = {
POPULATE_IEEE_REASON(RESERVED),
POPULATE_IEEE_REASON(UNSPECIFIED),
[etc...]
};
So this function becomes something like:
const char *ieee80211_get_reason_code_string(u16 reason_code)
{
int i;
for (i = 0; i < ARRAY_SIZE(reasons); i++) {
if (reasons[i].code == reason_code)
return reasons[i].desc;
}
return "UNKNOWN";
}
This seems a lot less fragile.
> diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
[]
> @@ -2231,8 +2231,8 @@ static void ieee80211_rx_mgmt_deauth(struct
> ieee80211_sub_if_data *sdata,
>
> reason_code = le16_to_cpu(mgmt->u.deauth.reason_code);
>
> - sdata_info(sdata, "deauthenticated from %pM (Reason: %u)\n",
> - bssid, reason_code);
> + sdata_info(sdata, "deauthenticated from %pM (reason: %s)\n",
> + bssid, ieee80211_get_reason_code_string(reason_code));
Perhaps
"%u:%s",
reason_code, ieee80211_get_reason_code_string(reason_code))
might be better here and the other places.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
