diff mbox

[net-next] net: Do not call ndo_dflt_fdb_dump if ndo_fdb_dump is defined.

Message ID 55af638eadcc08cbaa78f82ff6a43cb3.squirrel@poczta.wsisiz.edu.pl
State Superseded, archived
Delegated to: David Miller
Headers show

Commit Message

Hubert Sokolowski Dec. 10, 2014, 5:20 p.m. UTC 
This change restores the semantic that was present
before 5e6d243587990a588143b9da3974833649595587
on how ndo_dflt_fdb_dump is called.
This semantic is still used for add and del operations
so let's keep it consistent.
Driver can still call ndo_dflt_fdb_dump from inside
its own fdb_dump routine when needed.
---
 net/core/rtnetlink.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Sergei Shtylyov Dec. 10, 2014, 7:28 p.m. UTC | #1 
Hello.

On 12/10/2014 08:20 PM, Hubert Sokolowski wrote:

> This change restores the semantic that was present
> before 5e6d243587990a588143b9da3974833649595587

    Please also specify that commit's  summary line in parens.

> on how ndo_dflt_fdb_dump is called.
> This semantic is still used for add and del operations
> so let's keep it consistent.
> Driver can still call ndo_dflt_fdb_dump from inside
> its own fdb_dump routine when needed.

    You didn't sign off on the patch, so it can't be applied.

[...]

WBR, Sergei

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index eaa057f..a9e5c37 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -2692,10 +2692,11 @@  static int rtnl_fdb_dump(struct sk_buff *skb, struct netlink_callback *cb)
 							 idx);
 		}

-		idx = ndo_dflt_fdb_dump(skb, cb, dev, NULL, idx);
 		if (dev->netdev_ops->ndo_fdb_dump)
 			idx = dev->netdev_ops->ndo_fdb_dump(skb, cb, bdev, dev,
 							    idx);
+		else
+			idx = ndo_dflt_fdb_dump(skb, cb, dev, NULL, idx);

 		cops = NULL;
 	}