diff options
| author | Dan Murphy <dmurphy@ti.com> | 2011-10-07 07:25:35 -0500 |
|---|---|---|
| committer | Dan Murphy <dmurphy@ti.com> | 2011-10-07 07:25:35 -0500 |
| commit | 14e4907b39ab83876d6f7240014917c8f6aa6aa9 (patch) | |
| tree | c0592cf82594b344e708733bd97362d14bc89c9f /net/netfilter | |
| parent | 015b0f58da4747135da9cce5d9077331a7118eda (diff) | |
| parent | 978c4b3eedb0d668ef6431fc138ae476f9edf9c1 (diff) | |
| download | kernel_samsung_espresso10-14e4907b39ab83876d6f7240014917c8f6aa6aa9.zip kernel_samsung_espresso10-14e4907b39ab83876d6f7240014917c8f6aa6aa9.tar.gz kernel_samsung_espresso10-14e4907b39ab83876d6f7240014917c8f6aa6aa9.tar.bz2 | |
Merge branch 'android-omap-3.0' into p-android-omap-3.0
* android-omap-3.0: (44 commits)
OMAP4: PM: Tesla (DSP) power domain doesn't transition to OFF
OMAP4: PM: dont program to greater LP state on suspend
OMAP4: PM: dont restore to greater LP state on resume
OMAP4: PM: Dont write to readonly/reserved powerdomain register on resume
OMAP4: PM: Skip resume powerdomain programing if state already achieved
OMAP4: PM: Honor powerdomain wakeup ON state in resume reprogramming
OMAP4: PM: Skip programming CPU states again on resume
OMAP4: PM: Print achieved state on failed transition
OMAP4: PM: Refactor resume pd programing
OMAP4: PM: Fold saving power state with programming suspend state
OMAP4: PM: Restore trim configuration before DPLL restore
GPIO: OMAP: set edge trigger for wakeup gpio
GPIO: OMAP: Fix GPIO_IRQWAKEN_0 access
netfilter: xt_qtaguid: Fix the stats info display order
omap: remoteproc: update suspend flag address
omap: rpmsg: remove call to rproc_last_busy from mbox callback
remoteproc: move remoteproc register dump before error notification
remoteproc: make rproc_set_secure a blocking call
omap4: add a new misc driver for setting secure mode
omap: remoteproc: enable setting iommu ttb
...
Change-Id: I05e426b5d2da76f5ba88b6196f268f9744c5f559
Signed-off-by: Dan Murphy <dmurphy@ti.com>
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 fd5d288..d223a23 100644 --- a/net/netfilter/xt_qtaguid.c +++ b/net/netfilter/xt_qtaguid.c @@ -2385,12 +2385,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); |