aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6/xfrm6_input.c
diff options
context:
space:
mode:
authorYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>2007-02-09 09:24:49 -0500
committerDavid S. Miller <davem@sunset.davemloft.net>2007-02-11 02:19:42 -0500
commit1ab1457c42bc078e5a9becd82a7f9f940b55c53a (patch)
treec25d27c58fb27f4c5930ad120995cc2e3f1e7a4f /net/ipv6/xfrm6_input.c
parente905a9edab7f4f14f9213b52234e4a346c690911 (diff)
[NET] IPV6: Fix whitespace errors.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/xfrm6_input.c')
-rw-r--r--net/ipv6/xfrm6_input.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/net/ipv6/xfrm6_input.c b/net/ipv6/xfrm6_input.c
index 5c8b7a568800..25250147bdc3 100644
--- a/net/ipv6/xfrm6_input.c
+++ b/net/ipv6/xfrm6_input.c
@@ -33,7 +33,7 @@ int xfrm6_rcv_spi(struct sk_buff *skb, __be32 spi)
33 seq = 0; 33 seq = 0;
34 if (!spi && (err = xfrm_parse_spi(skb, nexthdr, &spi, &seq)) != 0) 34 if (!spi && (err = xfrm_parse_spi(skb, nexthdr, &spi, &seq)) != 0)
35 goto drop; 35 goto drop;
36 36
37 do { 37 do {
38 struct ipv6hdr *iph = skb->nh.ipv6h; 38 struct ipv6hdr *iph = skb->nh.ipv6h;
39 39
@@ -115,7 +115,7 @@ int xfrm6_rcv_spi(struct sk_buff *skb, __be32 spi)
115 __skb_push(skb, skb->data - skb->nh.raw); 115 __skb_push(skb, skb->data - skb->nh.raw);
116 116
117 NF_HOOK(PF_INET6, NF_IP6_PRE_ROUTING, skb, skb->dev, NULL, 117 NF_HOOK(PF_INET6, NF_IP6_PRE_ROUTING, skb, skb->dev, NULL,
118 ip6_rcv_finish); 118 ip6_rcv_finish);
119 return -1; 119 return -1;
120#else 120#else
121 return 1; 121 return 1;
@@ -142,12 +142,12 @@ int xfrm6_rcv(struct sk_buff **pskb)
142int xfrm6_input_addr(struct sk_buff *skb, xfrm_address_t *daddr, 142int xfrm6_input_addr(struct sk_buff *skb, xfrm_address_t *daddr,
143 xfrm_address_t *saddr, u8 proto) 143 xfrm_address_t *saddr, u8 proto)
144{ 144{
145 struct xfrm_state *x = NULL; 145 struct xfrm_state *x = NULL;
146 int wildcard = 0; 146 int wildcard = 0;
147 struct in6_addr any; 147 struct in6_addr any;
148 xfrm_address_t *xany; 148 xfrm_address_t *xany;
149 struct xfrm_state *xfrm_vec_one = NULL; 149 struct xfrm_state *xfrm_vec_one = NULL;
150 int nh = 0; 150 int nh = 0;
151 int i = 0; 151 int i = 0;
152 152
153 ipv6_addr_set(&any, 0, 0, 0, 0); 153 ipv6_addr_set(&any, 0, 0, 0, 0);
@@ -168,12 +168,12 @@ int xfrm6_input_addr(struct sk_buff *skb, xfrm_address_t *daddr,
168 break; 168 break;
169 case 2: 169 case 2:
170 default: 170 default:
171 /* lookup state with wild-card addresses */ 171 /* lookup state with wild-card addresses */
172 wildcard = 1; /* XXX */ 172 wildcard = 1; /* XXX */
173 dst = xany; 173 dst = xany;
174 src = xany; 174 src = xany;
175 break; 175 break;
176 } 176 }
177 177
178 x = xfrm_state_lookup_byaddr(dst, src, proto, AF_INET6); 178 x = xfrm_state_lookup_byaddr(dst, src, proto, AF_INET6);
179 if (!x) 179 if (!x)
@@ -193,8 +193,8 @@ int xfrm6_input_addr(struct sk_buff *skb, xfrm_address_t *daddr,
193 if (unlikely(x->km.state != XFRM_STATE_VALID)) { 193 if (unlikely(x->km.state != XFRM_STATE_VALID)) {
194 spin_unlock(&x->lock); 194 spin_unlock(&x->lock);
195 xfrm_state_put(x); 195 xfrm_state_put(x);
196 x = NULL; 196 x = NULL;
197 continue; 197 continue;
198 } 198 }
199 if (xfrm_state_check_expire(x)) { 199 if (xfrm_state_check_expire(x)) {
200 spin_unlock(&x->lock); 200 spin_unlock(&x->lock);