summaryrefslogtreecommitdiffstats
path: root/kernel/ip_set_hash_net.c
diff options
context:
space:
mode:
authorJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2011-01-20 23:10:26 +0100
committerJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2011-01-20 23:10:26 +0100
commited3c453a0787ddc10c5ce6010bd6ac663c740b68 (patch)
tree10f36ee9dd9883d95c0e2a680483fcdacefc4e28 /kernel/ip_set_hash_net.c
parenteb873d2fc5240a873bc52d0cc57e4062288b291b (diff)
Un-inline functions which are not small enough
Diffstat (limited to 'kernel/ip_set_hash_net.c')
-rw-r--r--kernel/ip_set_hash_net.c26
1 files changed, 4 insertions, 22 deletions
diff --git a/kernel/ip_set_hash_net.c b/kernel/ip_set_hash_net.c
index 175c621..bdaebb4 100644
--- a/kernel/ip_set_hash_net.c
+++ b/kernel/ip_set_hash_net.c
@@ -81,14 +81,6 @@ hash_net4_data_copy(struct hash_net4_elem *dst,
}
static inline void
-hash_net4_data_swap(struct hash_net4_elem *dst,
- struct hash_net4_elem *src)
-{
- swap(dst->ip, src->ip);
- swap(dst->cidr, src->cidr);
-}
-
-static inline void
hash_net4_data_netmask(struct hash_net4_elem *elem, u8 cidr)
{
elem->ip &= ip_set_netmask(cidr);
@@ -102,7 +94,7 @@ hash_net4_data_zero_out(struct hash_net4_elem *elem)
elem->cidr = 0;
}
-static inline bool
+static bool
hash_net4_data_list(struct sk_buff *skb, const struct hash_net4_elem *data)
{
NLA_PUT_IPADDR4(skb, IPSET_ATTR_IP, data->ip);
@@ -113,7 +105,7 @@ nla_put_failure:
return 1;
}
-static inline bool
+static bool
hash_net4_data_tlist(struct sk_buff *skb, const struct hash_net4_elem *data)
{
const struct hash_net4_telem *tdata =
@@ -257,16 +249,6 @@ hash_net6_data_copy(struct hash_net6_elem *dst,
}
static inline void
-hash_net6_data_swap(struct hash_net6_elem *dst, struct hash_net6_elem *src)
-{
- struct hash_net6_elem tmp;
-
- memcpy(&tmp, dst, sizeof(tmp));
- memcpy(dst, src, sizeof(tmp));
- memcpy(src, &tmp, sizeof(tmp));
-}
-
-static inline void
hash_net6_data_zero_out(struct hash_net6_elem *elem)
{
elem->cidr = 0;
@@ -288,7 +270,7 @@ hash_net6_data_netmask(struct hash_net6_elem *elem, u8 cidr)
elem->cidr = cidr;
}
-static inline bool
+static bool
hash_net6_data_list(struct sk_buff *skb, const struct hash_net6_elem *data)
{
NLA_PUT_IPADDR6(skb, IPSET_ATTR_IP, &data->ip);
@@ -299,7 +281,7 @@ nla_put_failure:
return 1;
}
-static inline bool
+static bool
hash_net6_data_tlist(struct sk_buff *skb, const struct hash_net6_elem *data)
{
const struct hash_net6_telem *e =