aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net/xfrm/xfrm_input.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/xfrm/xfrm_input.c b/net/xfrm/xfrm_input.c
index 8ac9d32fb79d..1c6051cb7733 100644
--- a/net/xfrm/xfrm_input.c
+++ b/net/xfrm/xfrm_input.c
@@ -265,8 +265,6 @@ int xfrm_input(struct sk_buff *skb, int nexthdr, __be32 spi, int encap_type)
265 goto lock; 265 goto lock;
266 } 266 }
267 267
268 daddr = (xfrm_address_t *)(skb_network_header(skb) +
269 XFRM_SPI_SKB_CB(skb)->daddroff);
270 family = XFRM_SPI_SKB_CB(skb)->family; 268 family = XFRM_SPI_SKB_CB(skb)->family;
271 269
272 /* if tunnel is present override skb->mark value with tunnel i_key */ 270 /* if tunnel is present override skb->mark value with tunnel i_key */
@@ -293,6 +291,8 @@ int xfrm_input(struct sk_buff *skb, int nexthdr, __be32 spi, int encap_type)
293 goto drop; 291 goto drop;
294 } 292 }
295 293
294 daddr = (xfrm_address_t *)(skb_network_header(skb) +
295 XFRM_SPI_SKB_CB(skb)->daddroff);
296 do { 296 do {
297 if (skb->sp->len == XFRM_MAX_DEPTH) { 297 if (skb->sp->len == XFRM_MAX_DEPTH) {
298 XFRM_INC_STATS(net, LINUX_MIB_XFRMINBUFFERERROR); 298 XFRM_INC_STATS(net, LINUX_MIB_XFRMINBUFFERERROR);