summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2013-06-04 11:17:19 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-06-04 11:17:19 -0700
commit89c2be335dcae504c89b804c6781cdd2bdd3112c (patch)
treef1a0282b247796302e4431f3ef2af5ba95f3a0fc
parent29393d69b3baed12ebe1530c29f59f4fe18ad029 (diff)
parent603746f0e3b645954f33be36f7602cc8205cb71c (diff)
downloadsystem_core-89c2be335dcae504c89b804c6781cdd2bdd3112c.zip
system_core-89c2be335dcae504c89b804c6781cdd2bdd3112c.tar.gz
system_core-89c2be335dcae504c89b804c6781cdd2bdd3112c.tar.bz2
am 603746f0: am 59fa7e10: Merge "Fixed reversed output in netstat Recv-Q Send-Q columns"
* commit '603746f0e3b645954f33be36f7602cc8205cb71c': Fixed reversed output in netstat Recv-Q Send-Q columns
-rw-r--r--toolbox/netstat.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/toolbox/netstat.c b/toolbox/netstat.c
index 5768599..05dc640 100644
--- a/toolbox/netstat.c
+++ b/toolbox/netstat.c
@@ -108,7 +108,7 @@ static void ipv4(const char *filename, const char *label) {
addr2str(AF_INET, &raddr, rport, rip);
printf("%4s %6d %6d %-22s %-22s %s\n",
- label, txq, rxq, lip, rip,
+ label, rxq, txq, lip, rip,
state2str(state));
}
}
@@ -136,7 +136,7 @@ static void ipv6(const char *filename, const char *label) {
addr2str(AF_INET6, &raddr6, rport, rip);
printf("%4s %6d %6d %-22s %-22s %s\n",
- label, txq, rxq, lip, rip,
+ label, rxq, txq, lip, rip,
state2str(state));
}
}