[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <1377002752-4622-4-git-send-email-f.fainelli@gmail.com>
Date: Tue, 20 Aug 2013 13:45:52 +0100
From: "Florian Fainelli" <f.fainelli@...il.com>
To: netdev@...r.kernel.org
cc: amwang@...hat.com, jiri@...nulli.us, stephen@...workplumber.org,
kaber@...sh.net, davem@...emloft.net, vyasevic@...hat.com,
johannes@...solutions.net, eric.dumazet@...il.com,
"Florian Fainelli" <f.fainelli@...il.com>
Subject: [PATCH 3/3] net: bridge: handle NETDEV_CHANGEROOM event
When a device which is a port member of a bridge has
needed_headroom/tailroom requirement changes, we need to walk the list
of bridge members, compute the minimum headroom or tailroom value, and
update the parent bridge device with the new values.
Signed-off-by: Florian Fainelli <f.fainelli@...il.com>
---
net/bridge/br_if.c | 32 ++++++++++++++++++++++++++++++++
net/bridge/br_notify.c | 5 +++++
net/bridge/br_private.h | 2 ++
3 files changed, 39 insertions(+)
diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
index aa6c9a8..017622b 100644
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c
@@ -296,6 +296,38 @@ int br_min_mtu(const struct net_bridge *br)
return mtu;
}
+int br_min_headroom(const struct net_bridge *br)
+{
+ const struct net_bridge_port *p;
+ unsigned short needed_headroom = 0;
+
+ ASSERT_RTNL();
+
+ list_for_each_entry(p, &br->port_list, list) {
+ if (!needed_headroom ||
+ p->dev->needed_headroom < needed_headroom)
+ needed_headroom = p->dev->needed_headroom;
+ }
+
+ return needed_headroom;
+}
+
+int br_min_tailroom(const struct net_bridge *br)
+{
+ const struct net_bridge_port *p;
+ unsigned short needed_tailroom = 0;
+
+ ASSERT_RTNL();
+
+ list_for_each_entry(p, &br->port_list, list) {
+ if (!needed_tailroom ||
+ p->dev->needed_tailroom < needed_tailroom)
+ needed_tailroom = p->dev->needed_tailroom;
+ }
+
+ return needed_tailroom;
+}
+
/*
* Recomputes features using slave's features
*/
diff --git a/net/bridge/br_notify.c b/net/bridge/br_notify.c
index 2998dd1..1c7be7c 100644
--- a/net/bridge/br_notify.c
+++ b/net/bridge/br_notify.c
@@ -107,6 +107,11 @@ static int br_device_event(struct notifier_block *unused, unsigned long event, v
/* Propagate to master device */
call_netdevice_notifiers(event, br->dev);
break;
+
+ case NETDEV_CHANGEROOM:
+ dev_set_headroom(br->dev, br_min_headroom(br));
+ dev_set_tailroom(br->dev, br_min_tailroom(br));
+ break;
}
/* Events that may cause spanning tree to refresh */
diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
index d41283c..81dc7aa 100644
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -421,6 +421,8 @@ extern int br_add_if(struct net_bridge *br,
extern int br_del_if(struct net_bridge *br,
struct net_device *dev);
extern int br_min_mtu(const struct net_bridge *br);
+extern int br_min_headroom(const struct net_bridge *br);
+extern int br_min_tailroom(const struct net_bridge *br);
extern netdev_features_t br_features_recompute(struct net_bridge *br,
netdev_features_t features);
--
1.8.1.2
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists