diff options
| author | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2011-01-20 18:51:54 +0100 |
|---|---|---|
| committer | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2011-01-20 18:51:54 +0100 |
| commit | 07d2ca530d353bc8a2b401674732ec3ba3d11977 (patch) | |
| tree | a26096e1e2a6fbdddbb58dbf85295177dc9c88f9 /kernel/ip_set_hash_ipportnet.c | |
| parent | e1594c72f5d9e79b782b193525c77adcfb9ae4ee (diff) | |
The get_ip*_port functions are too large to be inlined, moved into the core.
Diffstat (limited to 'kernel/ip_set_hash_ipportnet.c')
| -rw-r--r-- | kernel/ip_set_hash_ipportnet.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/ip_set_hash_ipportnet.c b/kernel/ip_set_hash_ipportnet.c index 2b06d51..b64730c 100644 --- a/kernel/ip_set_hash_ipportnet.c +++ b/kernel/ip_set_hash_ipportnet.c @@ -168,8 +168,8 @@ hash_ipportnet4_kadt(struct ip_set *set, const struct sk_buff *skb, if (adt == IPSET_TEST) data.cidr = HOST_MASK; - if (!get_ip4_port(skb, flags & IPSET_DIM_TWO_SRC, - &data.port, &data.proto)) + if (!ip_set_get_ip4_port(skb, flags & IPSET_DIM_TWO_SRC, + &data.port, &data.proto)) return -EINVAL; ip4addrptr(skb, flags & IPSET_DIM_ONE_SRC, &data.ip); @@ -453,8 +453,8 @@ hash_ipportnet6_kadt(struct ip_set *set, const struct sk_buff *skb, if (adt == IPSET_TEST) data.cidr = HOST_MASK; - if (!get_ip6_port(skb, flags & IPSET_DIM_TWO_SRC, - &data.port, &data.proto)) + if (!ip_set_get_ip6_port(skb, flags & IPSET_DIM_TWO_SRC, + &data.port, &data.proto)) return -EINVAL; ip6addrptr(skb, flags & IPSET_DIM_ONE_SRC, &data.ip.in6); |