]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
staging: octeon: fix build failure with XFRM enabled
authorFlorian Westphal <fw@strlen.de>
Fri, 21 Dec 2018 20:57:26 +0000 (21:57 +0100)
committerDavid S. Miller <davem@davemloft.net>
Mon, 24 Dec 2018 22:13:58 +0000 (14:13 -0800)
skb->sp doesn't exist anymore in the next-next tree, so mips defconfig
no longer builds.  Use helper instead to reset the secpath.

Not even compile tested.

Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Reported-by: Guenter Roeck <linux@roeck-us.net>
Fixes: 4165079ba328d ("net: switch secpath to use skb extension infrastructure")
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/staging/octeon/ethernet-tx.c

index df3441b815bba926d508eb1dc2079c6e63ab7cf0..317c9720467ceef23c99a5f4f3fa7c6eae628051 100644 (file)
@@ -359,8 +359,7 @@ int cvm_oct_xmit(struct sk_buff *skb, struct net_device *dev)
        dst_release(skb_dst(skb));
        skb_dst_set(skb, NULL);
 #ifdef CONFIG_XFRM
-       secpath_put(skb->sp);
-       skb->sp = NULL;
+       secpath_reset(skb);
 #endif
        nf_reset(skb);