diff options
| author | JP Abgrall <jpa@google.com> | 2013-02-07 14:52:33 -0800 |
|---|---|---|
| committer | JP Abgrall <jpa@google.com> | 2013-02-07 14:52:33 -0800 |
| commit | 9c1eb87855672aa078e4282c6c1944fc71259088 (patch) | |
| tree | 06f9952fadab3240af248b3f422224f075d404da /net | |
| parent | df617531ae029e87bfc84aaa1adc5fdbee007bb6 (diff) | |
| parent | 5310c3c75b0dd301da8c76e0971e82d194df6fdb (diff) | |
| download | kernel_samsung_tuna-9c1eb87855672aa078e4282c6c1944fc71259088.zip kernel_samsung_tuna-9c1eb87855672aa078e4282c6c1944fc71259088.tar.gz kernel_samsung_tuna-9c1eb87855672aa078e4282c6c1944fc71259088.tar.bz2 | |
Merge remote-tracking branch 'common/android-3.0' into android-omap-3.0
* common/android-3.0:
netfilter: xt_qtaguid: Allow tracking loopback
Diffstat (limited to 'net')
| -rw-r--r-- | net/netfilter/xt_qtaguid.c | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/net/netfilter/xt_qtaguid.c b/net/netfilter/xt_qtaguid.c index 25f2cee..495b62e 100644 --- a/net/netfilter/xt_qtaguid.c +++ b/net/netfilter/xt_qtaguid.c @@ -1108,18 +1108,13 @@ static void iface_stat_create(struct net_device *net_dev, spin_lock_bh(&iface_stat_list_lock); entry = get_iface_entry(ifname); if (entry != NULL) { - bool activate = !ipv4_is_loopback(ipaddr); IF_DEBUG("qtaguid: iface_stat: create(%s): entry=%p\n", ifname, entry); iface_check_stats_reset_and_adjust(net_dev, entry); - _iface_stat_set_active(entry, net_dev, activate); + _iface_stat_set_active(entry, net_dev, true); IF_DEBUG("qtaguid: %s(%s): " "tracking now %d on ip=%pI4\n", __func__, - entry->ifname, activate, &ipaddr); - goto done_unlock_put; - } else if (ipv4_is_loopback(ipaddr)) { - IF_DEBUG("qtaguid: iface_stat: create(%s): " - "ignore loopback dev. ip=%pI4\n", ifname, &ipaddr); + entry->ifname, true, &ipaddr); goto done_unlock_put; } @@ -1170,19 +1165,13 @@ static void iface_stat_create_ipv6(struct net_device *net_dev, spin_lock_bh(&iface_stat_list_lock); entry = get_iface_entry(ifname); if (entry != NULL) { - bool activate = !(addr_type & IPV6_ADDR_LOOPBACK); IF_DEBUG("qtaguid: %s(%s): entry=%p\n", __func__, ifname, entry); iface_check_stats_reset_and_adjust(net_dev, entry); - _iface_stat_set_active(entry, net_dev, activate); + _iface_stat_set_active(entry, net_dev, true); IF_DEBUG("qtaguid: %s(%s): " "tracking now %d on ip=%pI6c\n", __func__, - entry->ifname, activate, &ifa->addr); - goto done_unlock_put; - } else if (addr_type & IPV6_ADDR_LOOPBACK) { - IF_DEBUG("qtaguid: %s(%s): " - "ignore loopback dev. ip=%pI6c\n", __func__, - ifname, &ifa->addr); + entry->ifname, true, &ifa->addr); goto done_unlock_put; } |