* [PATCH net-next] staging: octeon: fix build failure with XFRM enabled
@ 2018-12-21 20:57 Florian Westphal
2018-12-22 8:35 ` Sergei Shtylyov
2018-12-24 17:58 ` David Miller
0 siblings, 2 replies; 4+ messages in thread
From: Florian Westphal @ 2018-12-21 20:57 UTC (permalink / raw)
To: netdev; +Cc: linux, linux-kernel, devel, Florian Westphal, Greg Kroah-Hartman
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>
---
Greg, David:
The patch will not break build for a tree that lacks the 'Fixes'
commit, so this can also go in via staging tree.
OTOH, net-next build is broken for mips/octeon, so I think in
this case net-next might make more sense?
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);
--
2.19.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH net-next] staging: octeon: fix build failure with XFRM enabled
2018-12-21 20:57 [PATCH net-next] staging: octeon: fix build failure with XFRM enabled Florian Westphal
@ 2018-12-22 8:35 ` Sergei Shtylyov
2018-12-24 17:58 ` David Miller
1 sibling, 0 replies; 4+ messages in thread
From: Sergei Shtylyov @ 2018-12-22 8:35 UTC (permalink / raw)
To: Florian Westphal, netdev; +Cc: linux, linux-kernel, devel, Greg Kroah-Hartman
Hello!
On 21.12.2018 23:57, Florian Westphal wrote:
> skb->sp doesn't exist anymore in the next-next tree, so mips defconfig
It's net-next. :-)
> 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>
[...]
MBR, Sergei
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH net-next] staging: octeon: fix build failure with XFRM enabled
2018-12-21 20:57 [PATCH net-next] staging: octeon: fix build failure with XFRM enabled Florian Westphal
2018-12-22 8:35 ` Sergei Shtylyov
@ 2018-12-24 17:58 ` David Miller
1 sibling, 0 replies; 4+ messages in thread
From: David Miller @ 2018-12-24 17:58 UTC (permalink / raw)
To: fw; +Cc: netdev, linux, linux-kernel, devel, gregkh
From: Florian Westphal <fw@strlen.de>
Date: Fri, 21 Dec 2018 21:57:26 +0100
> 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>
> ---
> Greg, David:
>
> The patch will not break build for a tree that lacks the 'Fixes'
> commit, so this can also go in via staging tree.
> OTOH, net-next build is broken for mips/octeon, so I think in
> this case net-next might make more sense?
Yeah I agree, that net-next is probably the best place for this.
Because I know that Linus is sensitive to situations where he is
sent a pull request, and then what he pulls doesn't match the pull
request shortlog etc. I have asked him how he would let me handle
this.
That's the only reason I haven't integrated this yet.
Just FYI!
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH net-next] staging: octeon: fix build failure with XFRM enabled
@ 2018-12-21 23:27 Guenter Roeck
0 siblings, 0 replies; 4+ messages in thread
From: Guenter Roeck @ 2018-12-21 23:27 UTC (permalink / raw)
To: Florian Westphal; +Cc: netdev, linux-kernel, devel, Greg Kroah-Hartman
On Fri, Dec 21, 2018 at 09:57:26PM +0100, Florian Westphal wrote:
> 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.
>
It does fix the build error.
Tested-by: Guenter Roeck <linux@roeck-us.net>
> 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>
> ---
> Greg, David:
>
> The patch will not break build for a tree that lacks the 'Fixes'
> commit, so this can also go in via staging tree.
> OTOH, net-next build is broken for mips/octeon, so I think in
> this case net-next might make more sense?
>
> 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);
>
> --
> 2.19.2
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-12-24 17:58 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-12-21 20:57 [PATCH net-next] staging: octeon: fix build failure with XFRM enabled Florian Westphal
2018-12-22 8:35 ` Sergei Shtylyov
2018-12-24 17:58 ` David Miller
2018-12-21 23:27 Guenter Roeck
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).