diff options
| author | Colin Cross <ccross@android.com> | 2011-10-06 19:28:14 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-10-06 19:28:14 -0700 |
| commit | 978c4b3eedb0d668ef6431fc138ae476f9edf9c1 (patch) | |
| tree | e4f097bdd24313fcb1c624fc596aafb79f175aa0 /net/netfilter | |
| parent | c3178f78016d88eef84fdd10b5449ce5c516ebef (diff) | |
| parent | ca37d833b0de24f87502c5df5234f4bf38884830 (diff) | |
| download | kernel_samsung_espresso10-978c4b3eedb0d668ef6431fc138ae476f9edf9c1.zip kernel_samsung_espresso10-978c4b3eedb0d668ef6431fc138ae476f9edf9c1.tar.gz kernel_samsung_espresso10-978c4b3eedb0d668ef6431fc138ae476f9edf9c1.tar.bz2 | |
Merge branch 'android-3.0' into android-omap-3.0
Diffstat (limited to 'net/netfilter')
| -rw-r--r-- | net/netfilter/xt_qtaguid.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/netfilter/xt_qtaguid.c b/net/netfilter/xt_qtaguid.c index b6b95c3..5d73eca 100644 --- a/net/netfilter/xt_qtaguid.c +++ b/net/netfilter/xt_qtaguid.c @@ -2383,12 +2383,12 @@ static int pp_stats_line(struct proc_print_info *ppi, int cnt_set) "idx iface acct_tag_hex uid_tag_int cnt_set " "rx_bytes rx_packets " "tx_bytes tx_packets " - "rx_tcp_packets rx_tcp_bytes " - "rx_udp_packets rx_udp_bytes " - "rx_other_packets rx_other_bytes " - "tx_tcp_packets tx_tcp_bytes " - "tx_udp_packets tx_udp_bytes " - "tx_other_packets tx_other_bytes\n"); + "rx_tcp_bytes rx_tcp_packets " + "rx_udp_bytes rx_udp_packets " + "rx_other_bytes rx_other_packets " + "tx_tcp_bytes tx_tcp_packets " + "tx_udp_bytes tx_udp_packets " + "tx_other_bytes tx_other_packets\n"); } else { tag_t tag = ppi->ts_entry->tn.tag; uid_t stat_uid = get_uid_from_tag(tag); |