commit 603746f0e3b645954f33be36f7602cc8205cb71c
author Brian Carlstrom <bdc@google.com> Tue Jun 04 10:28:55 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Jun 04 10:28:55 2013 -0700
tree 2958a1bca746d580a217a94f9434d5fd382f9579
parent 54d19aa66c6d446c97172599a9317caa6c456741
parent 59fa7e107d43a4ef521413ec0bb7b0c2a5525071

am 59fa7e10: Merge "Fixed reversed output in netstat Recv-Q Send-Q columns"

* commit '59fa7e107d43a4ef521413ec0bb7b0c2a5525071':
  Fixed reversed output in netstat Recv-Q Send-Q columns

toolbox/netstat.c

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 @@
             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 @@
             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));
         }
     }