public inbox for netdev@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH net-next] net: fib_rules: fix l3mdev netlink attr processing
@ 2018-04-24  3:08 Roopa Prabhu
  2018-04-24  3:21 ` David Miller
  0 siblings, 1 reply; 3+ messages in thread
From: Roopa Prabhu @ 2018-04-24  3:08 UTC (permalink / raw)
  To: davem; +Cc: netdev, dsa

From: Roopa Prabhu <roopa@cumulusnetworks.com>

Fixes: b16fb418b1bf ("net: fib_rules: add extack support")
Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
---
Looks like I broke this when i split extack changes into a separate patch :(

 net/core/fib_rules.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/net/core/fib_rules.c b/net/core/fib_rules.c
index ebd9351..2271c80 100644
--- a/net/core/fib_rules.c
+++ b/net/core/fib_rules.c
@@ -541,8 +541,10 @@ static int fib_nl2rule(struct sk_buff *skb, struct nlmsghdr *nlh,
 		nlrule->l3mdev = nla_get_u8(tb[FRA_L3MDEV]);
 		if (nlrule->l3mdev != 1)
 #endif
+		{
 			NL_SET_ERR_MSG(extack, "Invalid l3mdev");
 			goto errout_free;
+		}
 	}
 
 	nlrule->action = frh->action;
-- 
2.1.4

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH net-next] net: fib_rules: fix l3mdev netlink attr processing
  2018-04-24  3:08 [PATCH net-next] net: fib_rules: fix l3mdev netlink attr processing Roopa Prabhu
@ 2018-04-24  3:21 ` David Miller
  2018-04-24  3:43   ` David Ahern
  0 siblings, 1 reply; 3+ messages in thread
From: David Miller @ 2018-04-24  3:21 UTC (permalink / raw)
  To: roopa; +Cc: netdev, dsa

From: Roopa Prabhu <roopa@cumulusnetworks.com>
Date: Mon, 23 Apr 2018 20:08:41 -0700

> From: Roopa Prabhu <roopa@cumulusnetworks.com>
> 
> Fixes: b16fb418b1bf ("net: fib_rules: add extack support")
> Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>

Applied.

It would be nice to get rid of these if() conditionals dangling
around ifdef blocks.  They are quite error prone.

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH net-next] net: fib_rules: fix l3mdev netlink attr processing
  2018-04-24  3:21 ` David Miller
@ 2018-04-24  3:43   ` David Ahern
  0 siblings, 0 replies; 3+ messages in thread
From: David Ahern @ 2018-04-24  3:43 UTC (permalink / raw)
  To: David Miller, roopa; +Cc: netdev

On 4/23/18 9:21 PM, David Miller wrote:
> From: Roopa Prabhu <roopa@cumulusnetworks.com>
> Date: Mon, 23 Apr 2018 20:08:41 -0700
> 
>> From: Roopa Prabhu <roopa@cumulusnetworks.com>
>>
>> Fixes: b16fb418b1bf ("net: fib_rules: add extack support")
>> Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
> 
> Applied.
> 
> It would be nice to get rid of these if() conditionals dangling
> around ifdef blocks.  They are quite error prone.
> 

I'll send a patch. I'd prefer a different message when NET_L3_MASTER_DEV
is not enabled.

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2018-04-24  3:43 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-04-24  3:08 [PATCH net-next] net: fib_rules: fix l3mdev netlink attr processing Roopa Prabhu
2018-04-24  3:21 ` David Miller
2018-04-24  3:43   ` David Ahern

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox