* [PATCH 3.18.y] Fix compilation error backporting upstream commit 9fc12023d6f5
@ 2018-08-04 12:27 Lorenzo Bianconi
2018-08-04 12:40 ` Greg KH
0 siblings, 1 reply; 3+ messages in thread
From: Lorenzo Bianconi @ 2018-08-04 12:27 UTC (permalink / raw)
To: gregkh; +Cc: stable, netdev
Fix following compilation error backporting upstream commit
9fc12023d6f5 ("ipv4: remove BUG_ON() from fib_compute_spec_dst)
net/ipv4/fib_frontend.c: In function 'fib_compute_spec_dst':
net/ipv4/fib_frontend.c:225:3: error: expected expression before 'if'
if (!fib_lookup(net, &fl4, &res))
net/ipv4/fib_frontend.c:200:20: warning: unused variable 'res'
struct fib_result res;
Fixes: 0e46da6c6fac ("ipv4: remove BUG_ON() from fib_compute_spec_dst")
Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>
---
net/ipv4/fib_frontend.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
index 924db4bedd88..0b29649627a7 100644
--- a/net/ipv4/fib_frontend.c
+++ b/net/ipv4/fib_frontend.c
@@ -221,7 +221,7 @@ __be32 fib_compute_spec_dst(struct sk_buff *skb)
fl4.saddr = 0;
fl4.flowi4_tos = RT_TOS(ip_hdr(skb)->tos);
fl4.flowi4_scope = scope;
- fl4.flowi4_mark = vmark ? skb->mark : 0,
+ fl4.flowi4_mark = vmark ? skb->mark : 0;
if (!fib_lookup(net, &fl4, &res))
return FIB_RES_PREFSRC(net, res);
} else {
--
2.18.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH 3.18.y] Fix compilation error backporting upstream commit 9fc12023d6f5
2018-08-04 12:27 [PATCH 3.18.y] Fix compilation error backporting upstream commit 9fc12023d6f5 Lorenzo Bianconi
@ 2018-08-04 12:40 ` Greg KH
2018-08-04 12:59 ` Lorenzo Bianconi
0 siblings, 1 reply; 3+ messages in thread
From: Greg KH @ 2018-08-04 12:40 UTC (permalink / raw)
To: Lorenzo Bianconi; +Cc: stable, netdev
On Sat, Aug 04, 2018 at 02:27:41PM +0200, Lorenzo Bianconi wrote:
> Fix following compilation error backporting upstream commit
> 9fc12023d6f5 ("ipv4: remove BUG_ON() from fib_compute_spec_dst)
>
> net/ipv4/fib_frontend.c: In function 'fib_compute_spec_dst':
> net/ipv4/fib_frontend.c:225:3: error: expected expression before 'if'
> if (!fib_lookup(net, &fl4, &res))
>
> net/ipv4/fib_frontend.c:200:20: warning: unused variable 'res'
> struct fib_result res;
>
> Fixes: 0e46da6c6fac ("ipv4: remove BUG_ON() from fib_compute_spec_dst")
> Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>
> ---
> net/ipv4/fib_frontend.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
> index 924db4bedd88..0b29649627a7 100644
> --- a/net/ipv4/fib_frontend.c
> +++ b/net/ipv4/fib_frontend.c
> @@ -221,7 +221,7 @@ __be32 fib_compute_spec_dst(struct sk_buff *skb)
> fl4.saddr = 0;
> fl4.flowi4_tos = RT_TOS(ip_hdr(skb)->tos);
> fl4.flowi4_scope = scope;
> - fl4.flowi4_mark = vmark ? skb->mark : 0,
> + fl4.flowi4_mark = vmark ? skb->mark : 0;
> if (!fib_lookup(net, &fl4, &res))
> return FIB_RES_PREFSRC(net, res);
> } else {
Thanks, but I fixed this about 6 hours ago, right?
greg k-h
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH 3.18.y] Fix compilation error backporting upstream commit 9fc12023d6f5
2018-08-04 12:40 ` Greg KH
@ 2018-08-04 12:59 ` Lorenzo Bianconi
0 siblings, 0 replies; 3+ messages in thread
From: Lorenzo Bianconi @ 2018-08-04 12:59 UTC (permalink / raw)
To: gregkh; +Cc: stable, netdev
> On Sat, Aug 04, 2018 at 02:27:41PM +0200, Lorenzo Bianconi wrote:
> > Fix following compilation error backporting upstream commit
> > 9fc12023d6f5 ("ipv4: remove BUG_ON() from fib_compute_spec_dst)
> >
> > net/ipv4/fib_frontend.c: In function 'fib_compute_spec_dst':
> > net/ipv4/fib_frontend.c:225:3: error: expected expression before 'if'
> > if (!fib_lookup(net, &fl4, &res))
> >
> > net/ipv4/fib_frontend.c:200:20: warning: unused variable 'res'
> > struct fib_result res;
> >
> > Fixes: 0e46da6c6fac ("ipv4: remove BUG_ON() from fib_compute_spec_dst")
> > Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>
> > ---
> > net/ipv4/fib_frontend.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
> > index 924db4bedd88..0b29649627a7 100644
> > --- a/net/ipv4/fib_frontend.c
> > +++ b/net/ipv4/fib_frontend.c
> > @@ -221,7 +221,7 @@ __be32 fib_compute_spec_dst(struct sk_buff *skb)
> > fl4.saddr = 0;
> > fl4.flowi4_tos = RT_TOS(ip_hdr(skb)->tos);
> > fl4.flowi4_scope = scope;
> > - fl4.flowi4_mark = vmark ? skb->mark : 0,
> > + fl4.flowi4_mark = vmark ? skb->mark : 0;
> > if (!fib_lookup(net, &fl4, &res))
> > return FIB_RES_PREFSRC(net, res);
> > } else {
>
> Thanks, but I fixed this about 6 hours ago, right?
>
Ops, right. Sorry for the noise :)
Regards,
Lorenzo
> greg k-h
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-08-04 15:00 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-08-04 12:27 [PATCH 3.18.y] Fix compilation error backporting upstream commit 9fc12023d6f5 Lorenzo Bianconi
2018-08-04 12:40 ` Greg KH
2018-08-04 12:59 ` Lorenzo Bianconi
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).