netfilter: ipset: move ip_set_get_ip_port() to ip_set_bitmap_port.c.

ip_set_get_ip_port() is only used in ip_set_bitmap_port.c.  Move it
there and make it static.

Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
Signed-off-by: Jozsef Kadlecsik <kadlec@netfilter.org>

diff --git a/kernel/include/linux/netfilter/ipset/ip_set_getport.h b/kernel/include/linux/netfilter/ipset/ip_set_getport.h
index a906df06948b0c120deafeff8215e3501d40c8be..09c5a96a53fe03b6644c25c93e6270adaca7546d 100644 (file)
--- a/kernel/include/linux/netfilter/ipset/ip_set_getport.h
+++ b/kernel/include/linux/netfilter/ipset/ip_set_getport.h
@@ -20,9 +20,6 @@ static inline bool ip_set_get_ip6_port(const struct sk_buff *skb, bool src,
 }
 #endif
 
-extern bool ip_set_get_ip_port(const struct sk_buff *skb, u8 pf, bool src,
-                               __be16 *port);
-
 static inline bool ip_set_proto_with_ports(u8 proto)
 {
        switch (proto) {

diff --git a/kernel/net/netfilter/ipset/ip_set_bitmap_port.c b/kernel/net/netfilter/ipset/ip_set_bitmap_port.c
index 1b492d8a276444f26b3cf7869a028f9d009e7ee3..75cec4a096423db5d5762af11060552a9dda6e96 100644 (file)
--- a/kernel/net/netfilter/ipset/ip_set_bitmap_port.c
+++ b/kernel/net/netfilter/ipset/ip_set_bitmap_port.c
@@ -102,6 +102,33 @@ bitmap_port_do_head(struct sk_buff *skb, const struct bitmap_port *map)
               nla_put_net16(skb, IPSET_ATTR_PORT_TO, htons(map->last_port));
 }
 
+static bool
+ip_set_get_ip_port(const struct sk_buff *skb, u8 pf, bool src, __be16 *port)
+{
+       bool ret;
+       u8 proto;
+
+       switch (pf) {
+       case NFPROTO_IPV4:
+               ret = ip_set_get_ip4_port(skb, src, port, &proto);
+               break;
+       case NFPROTO_IPV6:
+               ret = ip_set_get_ip6_port(skb, src, port, &proto);
+               break;
+       default:
+               return false;
+       }
+       if (!ret)
+               return ret;
+       switch (proto) {
+       case IPPROTO_TCP:
+       case IPPROTO_UDP:
+               return true;
+       default:
+               return false;
+       }
+}
+
 static int
 bitmap_port_kadt(struct ip_set *set, const struct sk_buff *skb,
                 const struct xt_action_param *par,

diff --git a/kernel/net/netfilter/ipset/ip_set_getport.c b/kernel/net/netfilter/ipset/ip_set_getport.c
index dc38efafe095834d1bc78beec11885888ec85472..ba0c124f48862d00a89c32d84eba6df468f9a6ef 100644 (file)
--- a/kernel/net/netfilter/ipset/ip_set_getport.c
+++ b/kernel/net/netfilter/ipset/ip_set_getport.c
@@ -153,31 +153,3 @@ ip_set_get_ip6_port(const struct sk_buff *skb, bool src,
 }
 EXPORT_SYMBOL_GPL(ip_set_get_ip6_port);
 #endif
-
-bool
-ip_set_get_ip_port(const struct sk_buff *skb, u8 pf, bool src, __be16 *port)
-{
-       bool ret;
-       u8 proto;
-
-       switch (pf) {
-       case NFPROTO_IPV4:
-               ret = ip_set_get_ip4_port(skb, src, port, &proto);
-               break;
-       case NFPROTO_IPV6:
-               ret = ip_set_get_ip6_port(skb, src, port, &proto);
-               break;
-       default:
-               return false;
-       }
-       if (!ret)
-               return ret;
-       switch (proto) {
-       case IPPROTO_TCP:
-       case IPPROTO_UDP:
-               return true;
-       default:
-               return false;
-       }
-}
-EXPORT_SYMBOL_GPL(ip_set_get_ip_port);