438e88e672
Use update_kernel to refresh all patches, required manual updates to: 610-netfilter_match_bypass_default_checks.patch 611-netfilter_match_bypass_default_table.patch 762-net-bridge-switchdev-Refactor-br_switchdev_fdb_notif.patch 764-net-bridge-switchdev-Send-FDB-notifications-for-host.patch Run-tested: x86_64 Nothing screamed out but any funny business with linux bridging should suspect this update first. Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
78 lines
2.4 KiB
Diff
78 lines
2.4 KiB
Diff
From 46fe6cecb296d850c1ee2b333e57093ac4b733f3 Mon Sep 17 00:00:00 2001
|
|
From: Tobias Waldekranz <tobias@waldekranz.com>
|
|
Date: Sat, 16 Jan 2021 02:25:09 +0100
|
|
Subject: [PATCH] net: bridge: switchdev: Refactor br_switchdev_fdb_notify
|
|
|
|
Instead of having to add more and more arguments to
|
|
br_switchdev_fdb_call_notifiers, get rid of it and build the info
|
|
struct directly in br_switchdev_fdb_notify.
|
|
|
|
Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
|
|
Reviewed-by: Vladimir Oltean <olteanv@gmail.com>
|
|
---
|
|
net/bridge/br_switchdev.c | 41 +++++++++++----------------------------
|
|
1 file changed, 11 insertions(+), 30 deletions(-)
|
|
|
|
--- a/net/bridge/br_switchdev.c
|
|
+++ b/net/bridge/br_switchdev.c
|
|
@@ -102,25 +102,16 @@ int br_switchdev_set_port_flag(struct ne
|
|
return 0;
|
|
}
|
|
|
|
-static void
|
|
-br_switchdev_fdb_call_notifiers(bool adding, const unsigned char *mac,
|
|
- u16 vid, struct net_device *dev,
|
|
- bool added_by_user, bool offloaded)
|
|
-{
|
|
- struct switchdev_notifier_fdb_info info;
|
|
- unsigned long notifier_type;
|
|
-
|
|
- info.addr = mac;
|
|
- info.vid = vid;
|
|
- info.added_by_user = added_by_user;
|
|
- info.offloaded = offloaded;
|
|
- notifier_type = adding ? SWITCHDEV_FDB_ADD_TO_DEVICE : SWITCHDEV_FDB_DEL_TO_DEVICE;
|
|
- call_switchdev_notifiers(notifier_type, dev, &info.info, NULL);
|
|
-}
|
|
-
|
|
void
|
|
br_switchdev_fdb_notify(const struct net_bridge_fdb_entry *fdb, int type)
|
|
{
|
|
+ struct switchdev_notifier_fdb_info info = {
|
|
+ .addr = fdb->key.addr.addr,
|
|
+ .vid = fdb->key.vlan_id,
|
|
+ .added_by_user = test_bit(BR_FDB_ADDED_BY_USER, &fdb->flags),
|
|
+ .offloaded = test_bit(BR_FDB_OFFLOADED, &fdb->flags),
|
|
+ };
|
|
+
|
|
if (!fdb->dst)
|
|
return;
|
|
if (test_bit(BR_FDB_LOCAL, &fdb->flags))
|
|
@@ -128,22 +119,12 @@ br_switchdev_fdb_notify(const struct net
|
|
|
|
switch (type) {
|
|
case RTM_DELNEIGH:
|
|
- br_switchdev_fdb_call_notifiers(false, fdb->key.addr.addr,
|
|
- fdb->key.vlan_id,
|
|
- fdb->dst->dev,
|
|
- test_bit(BR_FDB_ADDED_BY_USER,
|
|
- &fdb->flags),
|
|
- test_bit(BR_FDB_OFFLOADED,
|
|
- &fdb->flags));
|
|
+ call_switchdev_notifiers(SWITCHDEV_FDB_DEL_TO_DEVICE,
|
|
+ fdb->dst->dev, &info.info, NULL);
|
|
break;
|
|
case RTM_NEWNEIGH:
|
|
- br_switchdev_fdb_call_notifiers(true, fdb->key.addr.addr,
|
|
- fdb->key.vlan_id,
|
|
- fdb->dst->dev,
|
|
- test_bit(BR_FDB_ADDED_BY_USER,
|
|
- &fdb->flags),
|
|
- test_bit(BR_FDB_OFFLOADED,
|
|
- &fdb->flags));
|
|
+ call_switchdev_notifiers(SWITCHDEV_FDB_ADD_TO_DEVICE,
|
|
+ fdb->dst->dev, &info.info, NULL);
|
|
break;
|
|
}
|
|
}
|