[NETFILTER]: Replace sk_buff ** with sk_buff *

[net-next-2.6.git] / net / ipv4 / netfilter.c

diff --git a/net/ipv4/netfilter.c b/net/ipv4/netfilter.c
index d1e3012d891f98fc44d2c88265a4f723b7b5a3aa..5539debf49735de2ea50105b507139ed1d35799d 100644 (file)
--- a/net/ipv4/netfilter.c
+++ b/net/ipv4/netfilter.c
@@ -9,9 +9,9 @@
 #include <net/ip.h>
 
 /* route_me_harder function, used by iptable_nat, iptable_mangle + ip_queue */
-int ip_route_me_harder(struct sk_buff **pskb, unsigned addr_type)
+int ip_route_me_harder(struct sk_buff *skb, unsigned addr_type)
 {
-       const struct iphdr *iph = ip_hdr(*pskb);
+       const struct iphdr *iph = ip_hdr(skb);
        struct rtable *rt;
        struct flowi fl = {};
        struct dst_entry *odst;
@@ -30,14 +30,14 @@ int ip_route_me_harder(struct sk_buff **pskb, unsigned addr_type)
                if (type == RTN_LOCAL)
                        fl.nl_u.ip4_u.saddr = iph->saddr;
                fl.nl_u.ip4_u.tos = RT_TOS(iph->tos);
-               fl.oif = (*pskb)->sk ? (*pskb)->sk->sk_bound_dev_if : 0;
-               fl.mark = (*pskb)->mark;
+               fl.oif = skb->sk ? skb->sk->sk_bound_dev_if : 0;
+               fl.mark = skb->mark;
                if (ip_route_output_key(&rt, &fl) != 0)
                        return -1;
 
                /* Drop old route. */
-               dst_release((*pskb)->dst);
-               (*pskb)->dst = &rt->u.dst;
+               dst_release(skb->dst);
+               skb->dst = &rt->u.dst;
        } else {
                /* non-local src, find valid iif to satisfy
                 * rp-filter when calling ip_route_input. */
@@ -45,8 +45,8 @@ int ip_route_me_harder(struct sk_buff **pskb, unsigned addr_type)
                if (ip_route_output_key(&rt, &fl) != 0)
                        return -1;
 
-               odst = (*pskb)->dst;
-               if (ip_route_input(*pskb, iph->daddr, iph->saddr,
+               odst = skb->dst;
+               if (ip_route_input(skb, iph->daddr, iph->saddr,
                                   RT_TOS(iph->tos), rt->u.dst.dev) != 0) {
                        dst_release(&rt->u.dst);
                        return -1;
@@ -55,21 +55,20 @@ int ip_route_me_harder(struct sk_buff **pskb, unsigned addr_type)
                dst_release(odst);
        }
 
-       if ((*pskb)->dst->error)
+       if (skb->dst->error)
                return -1;
 
 #ifdef CONFIG_XFRM
-       if (!(IPCB(*pskb)->flags & IPSKB_XFRM_TRANSFORMED) &&
-           xfrm_decode_session(*pskb, &fl, AF_INET) == 0)
-               if (xfrm_lookup(&(*pskb)->dst, &fl, (*pskb)->sk, 0))
+       if (!(IPCB(skb)->flags & IPSKB_XFRM_TRANSFORMED) &&
+           xfrm_decode_session(skb, &fl, AF_INET) == 0)
+               if (xfrm_lookup(&skb->dst, &fl, skb->sk, 0))
                        return -1;
 #endif
 
        /* Change in oif may mean change in hh_len. */
-       hh_len = (*pskb)->dst->dev->hard_header_len;
-       if (skb_headroom(*pskb) < hh_len &&
-           pskb_expand_head(*pskb, hh_len - skb_headroom(*pskb), 0,
-                            GFP_ATOMIC))
+       hh_len = skb->dst->dev->hard_header_len;
+       if (skb_headroom(skb) < hh_len &&
+           pskb_expand_head(skb, hh_len - skb_headroom(skb), 0, GFP_ATOMIC))
                return -1;
 
        return 0;
@@ -77,33 +76,32 @@ int ip_route_me_harder(struct sk_buff **pskb, unsigned addr_type)
 EXPORT_SYMBOL(ip_route_me_harder);
 
 #ifdef CONFIG_XFRM
-int ip_xfrm_me_harder(struct sk_buff **pskb)
+int ip_xfrm_me_harder(struct sk_buff *skb)
 {
        struct flowi fl;
        unsigned int hh_len;
        struct dst_entry *dst;
 
-       if (IPCB(*pskb)->flags & IPSKB_XFRM_TRANSFORMED)
+       if (IPCB(skb)->flags & IPSKB_XFRM_TRANSFORMED)
                return 0;
-       if (xfrm_decode_session(*pskb, &fl, AF_INET) < 0)
+       if (xfrm_decode_session(skb, &fl, AF_INET) < 0)
                return -1;
 
-       dst = (*pskb)->dst;
+       dst = skb->dst;
        if (dst->xfrm)
                dst = ((struct xfrm_dst *)dst)->route;
        dst_hold(dst);
 
-       if (xfrm_lookup(&dst, &fl, (*pskb)->sk, 0) < 0)
+       if (xfrm_lookup(&dst, &fl, skb->sk, 0) < 0)
                return -1;
 
-       dst_release((*pskb)->dst);
-       (*pskb)->dst = dst;
+       dst_release(skb->dst);
+       skb->dst = dst;
 
        /* Change in oif may mean change in hh_len. */
-       hh_len = (*pskb)->dst->dev->hard_header_len;
-       if (skb_headroom(*pskb) < hh_len &&
-           pskb_expand_head(*pskb, hh_len - skb_headroom(*pskb), 0,
-                            GFP_ATOMIC))
+       hh_len = skb->dst->dev->hard_header_len;
+       if (skb_headroom(skb) < hh_len &&
+           pskb_expand_head(skb, hh_len - skb_headroom(skb), 0, GFP_ATOMIC))
                return -1;
        return 0;
 }
@@ -137,17 +135,17 @@ static void nf_ip_saveroute(const struct sk_buff *skb, struct nf_info *info)
        }
 }
 
-static int nf_ip_reroute(struct sk_buff **pskb, const struct nf_info *info)
+static int nf_ip_reroute(struct sk_buff *skb, const struct nf_info *info)
 {
        const struct ip_rt_info *rt_info = nf_info_reroute(info);
 
        if (info->hook == NF_IP_LOCAL_OUT) {
-               const struct iphdr *iph = ip_hdr(*pskb);
+               const struct iphdr *iph = ip_hdr(skb);
 
                if (!(iph->tos == rt_info->tos
                      && iph->daddr == rt_info->daddr
                      && iph->saddr == rt_info->saddr))
-                       return ip_route_me_harder(pskb, RTN_UNSPEC);
+                       return ip_route_me_harder(skb, RTN_UNSPEC);
        }
        return 0;
 }