diff options
author | Sujith Manoharan <c_manoha@qca.qualcomm.com> | 2012-02-16 01:21:23 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-02-27 14:05:42 -0500 |
commit | 4203214ee28d285c580263e2ea80848fd5e676f3 (patch) | |
tree | b840563ad476f0594752860968157a35f900bb37 /drivers/net/wireless/ath/ath9k/debug.c | |
parent | f8b815dc0e0942c45919d814e319c14c1221fa81 (diff) |
ath9k: Prettify recv debugfs file output
Dumping the RSSI information in the middle of error
statistics is a bit misleading. Move them to the end.
Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/debug.c')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/debug.c | 97 |
1 files changed, 45 insertions, 52 deletions
diff --git a/drivers/net/wireless/ath/ath9k/debug.c b/drivers/net/wireless/ath/ath9k/debug.c index fe1f55f7c292..5a838fc28b61 100644 --- a/drivers/net/wireless/ath/ath9k/debug.c +++ b/drivers/net/wireless/ath/ath9k/debug.c | |||
@@ -880,12 +880,12 @@ static ssize_t read_file_recv(struct file *file, char __user *user_buf, | |||
880 | size_t count, loff_t *ppos) | 880 | size_t count, loff_t *ppos) |
881 | { | 881 | { |
882 | #define PHY_ERR(s, p) \ | 882 | #define PHY_ERR(s, p) \ |
883 | len += snprintf(buf + len, size - len, "%18s : %10u\n", s, \ | 883 | len += snprintf(buf + len, size - len, "%22s : %10u\n", s, \ |
884 | sc->debug.stats.rxstats.phy_err_stats[p]); | 884 | sc->debug.stats.rxstats.phy_err_stats[p]); |
885 | 885 | ||
886 | struct ath_softc *sc = file->private_data; | 886 | struct ath_softc *sc = file->private_data; |
887 | char *buf; | 887 | char *buf; |
888 | unsigned int len = 0, size = 1400; | 888 | unsigned int len = 0, size = 1600; |
889 | ssize_t retval = 0; | 889 | ssize_t retval = 0; |
890 | 890 | ||
891 | buf = kzalloc(size, GFP_KERNEL); | 891 | buf = kzalloc(size, GFP_KERNEL); |
@@ -893,87 +893,80 @@ static ssize_t read_file_recv(struct file *file, char __user *user_buf, | |||
893 | return -ENOMEM; | 893 | return -ENOMEM; |
894 | 894 | ||
895 | len += snprintf(buf + len, size - len, | 895 | len += snprintf(buf + len, size - len, |
896 | "%18s : %10u\n", "CRC ERR", | 896 | "%22s : %10u\n", "CRC ERR", |
897 | sc->debug.stats.rxstats.crc_err); | 897 | sc->debug.stats.rxstats.crc_err); |
898 | len += snprintf(buf + len, size - len, | 898 | len += snprintf(buf + len, size - len, |
899 | "%18s : %10u\n", "DECRYPT CRC ERR", | 899 | "%22s : %10u\n", "DECRYPT CRC ERR", |
900 | sc->debug.stats.rxstats.decrypt_crc_err); | 900 | sc->debug.stats.rxstats.decrypt_crc_err); |
901 | len += snprintf(buf + len, size - len, | 901 | len += snprintf(buf + len, size - len, |
902 | "%18s : %10u\n", "PHY ERR", | 902 | "%22s : %10u\n", "PHY ERR", |
903 | sc->debug.stats.rxstats.phy_err); | 903 | sc->debug.stats.rxstats.phy_err); |
904 | len += snprintf(buf + len, size - len, | 904 | len += snprintf(buf + len, size - len, |
905 | "%18s : %10u\n", "MIC ERR", | 905 | "%22s : %10u\n", "MIC ERR", |
906 | sc->debug.stats.rxstats.mic_err); | 906 | sc->debug.stats.rxstats.mic_err); |
907 | len += snprintf(buf + len, size - len, | 907 | len += snprintf(buf + len, size - len, |
908 | "%18s : %10u\n", "PRE-DELIM CRC ERR", | 908 | "%22s : %10u\n", "PRE-DELIM CRC ERR", |
909 | sc->debug.stats.rxstats.pre_delim_crc_err); | 909 | sc->debug.stats.rxstats.pre_delim_crc_err); |
910 | len += snprintf(buf + len, size - len, | 910 | len += snprintf(buf + len, size - len, |
911 | "%18s : %10u\n", "POST-DELIM CRC ERR", | 911 | "%22s : %10u\n", "POST-DELIM CRC ERR", |
912 | sc->debug.stats.rxstats.post_delim_crc_err); | 912 | sc->debug.stats.rxstats.post_delim_crc_err); |
913 | len += snprintf(buf + len, size - len, | 913 | len += snprintf(buf + len, size - len, |
914 | "%18s : %10u\n", "DECRYPT BUSY ERR", | 914 | "%22s : %10u\n", "DECRYPT BUSY ERR", |
915 | sc->debug.stats.rxstats.decrypt_busy_err); | 915 | sc->debug.stats.rxstats.decrypt_busy_err); |
916 | 916 | ||
917 | PHY_ERR("UNDERRUN ERR", ATH9K_PHYERR_UNDERRUN); | ||
918 | PHY_ERR("TIMING ERR", ATH9K_PHYERR_TIMING); | ||
919 | PHY_ERR("PARITY ERR", ATH9K_PHYERR_PARITY); | ||
920 | PHY_ERR("RATE ERR", ATH9K_PHYERR_RATE); | ||
921 | PHY_ERR("LENGTH ERR", ATH9K_PHYERR_LENGTH); | ||
922 | PHY_ERR("RADAR ERR", ATH9K_PHYERR_RADAR); | ||
923 | PHY_ERR("SERVICE ERR", ATH9K_PHYERR_SERVICE); | ||
924 | PHY_ERR("TOR ERR", ATH9K_PHYERR_TOR); | ||
925 | PHY_ERR("OFDM-TIMING ERR", ATH9K_PHYERR_OFDM_TIMING); | ||
926 | PHY_ERR("OFDM-SIGNAL-PARITY ERR", ATH9K_PHYERR_OFDM_SIGNAL_PARITY); | ||
927 | PHY_ERR("OFDM-RATE ERR", ATH9K_PHYERR_OFDM_RATE_ILLEGAL); | ||
928 | PHY_ERR("OFDM-LENGTH ERR", ATH9K_PHYERR_OFDM_LENGTH_ILLEGAL); | ||
929 | PHY_ERR("OFDM-POWER-DROP ERR", ATH9K_PHYERR_OFDM_POWER_DROP); | ||
930 | PHY_ERR("OFDM-SERVICE ERR", ATH9K_PHYERR_OFDM_SERVICE); | ||
931 | PHY_ERR("OFDM-RESTART ERR", ATH9K_PHYERR_OFDM_RESTART); | ||
932 | PHY_ERR("FALSE-RADAR-EXT ERR", ATH9K_PHYERR_FALSE_RADAR_EXT); | ||
933 | PHY_ERR("CCK-TIMING ERR", ATH9K_PHYERR_CCK_TIMING); | ||
934 | PHY_ERR("CCK-HEADER-CRC ERR", ATH9K_PHYERR_CCK_HEADER_CRC); | ||
935 | PHY_ERR("CCK-RATE ERR", ATH9K_PHYERR_CCK_RATE_ILLEGAL); | ||
936 | PHY_ERR("CCK-SERVICE ERR", ATH9K_PHYERR_CCK_SERVICE); | ||
937 | PHY_ERR("CCK-RESTART ERR", ATH9K_PHYERR_CCK_RESTART); | ||
938 | PHY_ERR("CCK-LENGTH ERR", ATH9K_PHYERR_CCK_LENGTH_ILLEGAL); | ||
939 | PHY_ERR("CCK-POWER-DROP ERR", ATH9K_PHYERR_CCK_POWER_DROP); | ||
940 | PHY_ERR("HT-CRC ERR", ATH9K_PHYERR_HT_CRC_ERROR); | ||
941 | PHY_ERR("HT-LENGTH ERR", ATH9K_PHYERR_HT_LENGTH_ILLEGAL); | ||
942 | PHY_ERR("HT-RATE ERR", ATH9K_PHYERR_HT_RATE_ILLEGAL); | ||
943 | |||
917 | len += snprintf(buf + len, size - len, | 944 | len += snprintf(buf + len, size - len, |
918 | "%18s : %10d\n", "RSSI-CTL0", | 945 | "%22s : %10d\n", "RSSI-CTL0", |
919 | sc->debug.stats.rxstats.rs_rssi_ctl0); | 946 | sc->debug.stats.rxstats.rs_rssi_ctl0); |
920 | |||
921 | len += snprintf(buf + len, size - len, | 947 | len += snprintf(buf + len, size - len, |
922 | "%18s : %10d\n", "RSSI-CTL1", | 948 | "%22s : %10d\n", "RSSI-CTL1", |
923 | sc->debug.stats.rxstats.rs_rssi_ctl1); | 949 | sc->debug.stats.rxstats.rs_rssi_ctl1); |
924 | |||
925 | len += snprintf(buf + len, size - len, | 950 | len += snprintf(buf + len, size - len, |
926 | "%18s : %10d\n", "RSSI-CTL2", | 951 | "%22s : %10d\n", "RSSI-CTL2", |
927 | sc->debug.stats.rxstats.rs_rssi_ctl2); | 952 | sc->debug.stats.rxstats.rs_rssi_ctl2); |
928 | |||
929 | len += snprintf(buf + len, size - len, | 953 | len += snprintf(buf + len, size - len, |
930 | "%18s : %10d\n", "RSSI-EXT0", | 954 | "%22s : %10d\n", "RSSI-EXT0", |
931 | sc->debug.stats.rxstats.rs_rssi_ext0); | 955 | sc->debug.stats.rxstats.rs_rssi_ext0); |
932 | |||
933 | len += snprintf(buf + len, size - len, | 956 | len += snprintf(buf + len, size - len, |
934 | "%18s : %10d\n", "RSSI-EXT1", | 957 | "%22s : %10d\n", "RSSI-EXT1", |
935 | sc->debug.stats.rxstats.rs_rssi_ext1); | 958 | sc->debug.stats.rxstats.rs_rssi_ext1); |
936 | |||
937 | len += snprintf(buf + len, size - len, | 959 | len += snprintf(buf + len, size - len, |
938 | "%18s : %10d\n", "RSSI-EXT2", | 960 | "%22s : %10d\n", "RSSI-EXT2", |
939 | sc->debug.stats.rxstats.rs_rssi_ext2); | 961 | sc->debug.stats.rxstats.rs_rssi_ext2); |
940 | |||
941 | len += snprintf(buf + len, size - len, | 962 | len += snprintf(buf + len, size - len, |
942 | "%18s : %10d\n", "Rx Antenna", | 963 | "%22s : %10d\n", "Rx Antenna", |
943 | sc->debug.stats.rxstats.rs_antenna); | 964 | sc->debug.stats.rxstats.rs_antenna); |
944 | |||
945 | PHY_ERR("UNDERRUN", ATH9K_PHYERR_UNDERRUN); | ||
946 | PHY_ERR("TIMING", ATH9K_PHYERR_TIMING); | ||
947 | PHY_ERR("PARITY", ATH9K_PHYERR_PARITY); | ||
948 | PHY_ERR("RATE", ATH9K_PHYERR_RATE); | ||
949 | PHY_ERR("LENGTH", ATH9K_PHYERR_LENGTH); | ||
950 | PHY_ERR("RADAR", ATH9K_PHYERR_RADAR); | ||
951 | PHY_ERR("SERVICE", ATH9K_PHYERR_SERVICE); | ||
952 | PHY_ERR("TOR", ATH9K_PHYERR_TOR); | ||
953 | PHY_ERR("OFDM-TIMING", ATH9K_PHYERR_OFDM_TIMING); | ||
954 | PHY_ERR("OFDM-SIGNAL-PARITY", ATH9K_PHYERR_OFDM_SIGNAL_PARITY); | ||
955 | PHY_ERR("OFDM-RATE", ATH9K_PHYERR_OFDM_RATE_ILLEGAL); | ||
956 | PHY_ERR("OFDM-LENGTH", ATH9K_PHYERR_OFDM_LENGTH_ILLEGAL); | ||
957 | PHY_ERR("OFDM-POWER-DROP", ATH9K_PHYERR_OFDM_POWER_DROP); | ||
958 | PHY_ERR("OFDM-SERVICE", ATH9K_PHYERR_OFDM_SERVICE); | ||
959 | PHY_ERR("OFDM-RESTART", ATH9K_PHYERR_OFDM_RESTART); | ||
960 | PHY_ERR("FALSE-RADAR-EXT", ATH9K_PHYERR_FALSE_RADAR_EXT); | ||
961 | PHY_ERR("CCK-TIMING", ATH9K_PHYERR_CCK_TIMING); | ||
962 | PHY_ERR("CCK-HEADER-CRC", ATH9K_PHYERR_CCK_HEADER_CRC); | ||
963 | PHY_ERR("CCK-RATE", ATH9K_PHYERR_CCK_RATE_ILLEGAL); | ||
964 | PHY_ERR("CCK-SERVICE", ATH9K_PHYERR_CCK_SERVICE); | ||
965 | PHY_ERR("CCK-RESTART", ATH9K_PHYERR_CCK_RESTART); | ||
966 | PHY_ERR("CCK-LENGTH", ATH9K_PHYERR_CCK_LENGTH_ILLEGAL); | ||
967 | PHY_ERR("CCK-POWER-DROP", ATH9K_PHYERR_CCK_POWER_DROP); | ||
968 | PHY_ERR("HT-CRC", ATH9K_PHYERR_HT_CRC_ERROR); | ||
969 | PHY_ERR("HT-LENGTH", ATH9K_PHYERR_HT_LENGTH_ILLEGAL); | ||
970 | PHY_ERR("HT-RATE", ATH9K_PHYERR_HT_RATE_ILLEGAL); | ||
971 | |||
972 | len += snprintf(buf + len, size - len, | 965 | len += snprintf(buf + len, size - len, |
973 | "%18s : %10u\n", "RX-Pkts-All", | 966 | "%22s : %10u\n", "RX-Pkts-All", |
974 | sc->debug.stats.rxstats.rx_pkts_all); | 967 | sc->debug.stats.rxstats.rx_pkts_all); |
975 | len += snprintf(buf + len, size - len, | 968 | len += snprintf(buf + len, size - len, |
976 | "%18s : %10u\n", "RX-Bytes-All", | 969 | "%22s : %10u\n", "RX-Bytes-All", |
977 | sc->debug.stats.rxstats.rx_bytes_all); | 970 | sc->debug.stats.rxstats.rx_bytes_all); |
978 | 971 | ||
979 | if (len > size) | 972 | if (len > size) |