diff options
| author | Pavel Roskin <proski@gnu.org> | 2007-07-10 02:21:45 -0400 |
|---|---|---|
| committer | Guido Guenther <agx@bogon.sigxcpu.org> | 2007-07-15 12:19:02 -0400 |
| commit | 52f394bd20798f8eb5618986fcf53dd4ff03eb78 (patch) | |
| tree | dc51d57158317049a7a0c6e7ebb5ec902383b8c1 | |
| parent | ac96fad34ab7b4b5bc63c4aa317baa707955b9ec (diff) | |
[PATCH] Make at76_dump_mib_mac_wep() more readable
It looked scary even considering that it was a purely debugging
function.
Signed-off-by: Pavel Roskin <proski@gnu.org>
| -rw-r--r-- | at76_usb.c | 21 |
1 files changed, 13 insertions, 8 deletions
@@ -1091,6 +1091,7 @@ static int at76_dump_mib_mac_addr(struct at76_priv *priv) static int at76_dump_mib_mac_wep(struct at76_priv *priv) { int ret = 0; + char *defkey; struct mib_mac_wep *mac_wep = kmalloc(sizeof(struct mib_mac_wep), GFP_KERNEL); @@ -1106,18 +1107,22 @@ static int at76_dump_mib_mac_wep(struct at76_priv *priv) goto err; } + if (mac_wep->wep_default_key_id < 4) + defkey = + hex2str(mac_wep-> + wep_default_keyvalue[mac_wep->wep_default_key_id], + mac_wep->encryption_level == 2 ? 13 : 5); + else + defkey = "<invalid key id>"; + dbg("%s: MIB MAC_WEP: priv_invoked %u def_key_id %u key_len %u " - "excl_unencr %u wep_icv_err %u wep_excluded %u encr_level %u key %d: %s", - priv->netdev->name, mac_wep->privacy_invoked, + "excl_unencr %u wep_icv_err %u wep_excluded %u encr_level %u " + "key %d: %s", priv->netdev->name, mac_wep->privacy_invoked, mac_wep->wep_default_key_id, mac_wep->wep_key_mapping_len, mac_wep->exclude_unencrypted, le32_to_cpu(mac_wep->wep_icv_error_count), - le32_to_cpu(mac_wep->wep_excluded_count), - mac_wep->encryption_level, mac_wep->wep_default_key_id, - mac_wep->wep_default_key_id < 4 ? - hex2str(mac_wep->wep_default_keyvalue[mac_wep->wep_default_key_id], - mac_wep->encryption_level == 2 ? 13 : 5) : - "<invalid key id>"); + le32_to_cpu(mac_wep->wep_excluded_count), mac_wep->encryption_level, + mac_wep->wep_default_key_id, defkey); err: kfree(mac_wep); |