diff options
| author |   Florian Westphal <fw@strlen.de> | 2018-12-21 21:57:26 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-12-24 14:13:58 -0800 |
| commit | 8762cdcd1d5055017770a54e2755bed30dd4f8b6 (patch) | |
| tree | 0906aaf6a29c4eb1c5fb977dc33e6151439e1c65 /drivers/staging | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | linux-dev-8762cdcd1d5055017770a54e2755bed30dd4f8b6.tar.xz linux-dev-8762cdcd1d5055017770a54e2755bed30dd4f8b6.zip | |
staging: octeon: fix build failure with XFRM enabled
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>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/octeon/ethernet-tx.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/staging/octeon/ethernet-tx.c b/drivers/staging/octeon/ethernet-tx.c index df3441b815bb..317c9720467c 100644 --- a/drivers/staging/octeon/ethernet-tx.c +++ b/drivers/staging/octeon/ethernet-tx.c @@ -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); |