History

bridge: call netdev_sw_port_stp_update when bridge port STP status changes

To notify switch driver of change in STP state of bridge port, add new .ndo op and provide switchdev wrapper func to call ndo op. Use it in bridge code then.

Scott Feldman committed 11 years ago

Commit 38dcf351 parent aecbe014 files · +38 −0Browse files

Unified · Split

4 files
  1. include/linux/netdevice.h +5 −0
  2. include/net/switchdev.h +7 −0
  3. net/bridge/br_stp.c +7 −0
  4. net/switchdev/switchdev.c +19 −0
include/linux/netdevice.h+5−0
@@ -1024,6 +1024,9 @@ typedef u16 (*select_queue_fallback_t)(struct net_device *dev, · 1023 unmodified lines
1024 * Called to get an ID of the switch chip this port is part of.1024 * Called to get an ID of the switch chip this port is part of.
1025 * If driver implements this, it indicates that it represents a port1025 * If driver implements this, it indicates that it represents a port
1026 * of a switch chip.1026 * of a switch chip.
1027 * int (*ndo_switch_port_stp_update)(struct net_device *dev, u8 state);
1028 * Called to notify switch device port of bridge port STP
1029 * state change.
1027 */1030 */
1028struct net_device_ops {1031struct net_device_ops {
1029 int (*ndo_init)(struct net_device *dev);1032 int (*ndo_init)(struct net_device *dev);
@@ -1180,6 +1183,8 @@ struct net_device_ops { · 150 unmodified lines
1180#ifdef CONFIG_NET_SWITCHDEV1183#ifdef CONFIG_NET_SWITCHDEV
1181 int (*ndo_switch_parent_id_get)(struct net_device *dev,1184 int (*ndo_switch_parent_id_get)(struct net_device *dev,
1182 struct netdev_phys_item_id *psid);1185 struct netdev_phys_item_id *psid);
1186 int (*ndo_switch_port_stp_update)(struct net_device *dev,
1187 u8 state);
1183#endif1188#endif
1184};1189};
1185 1190
include/net/switchdev.h+7−0
@@ -16,6 +16,7 @@ · 15 unmodified lines
16 16
17int netdev_switch_parent_id_get(struct net_device *dev,17int netdev_switch_parent_id_get(struct net_device *dev,
18 struct netdev_phys_item_id *psid);18 struct netdev_phys_item_id *psid);
19int netdev_switch_port_stp_update(struct net_device *dev, u8 state);
19 20
20#else21#else
21 22
@@ -25,6 +26,12 @@ static inline int netdev_switch_parent_id_get(struct net_device *dev, · 3 unmodified lines
25 return -EOPNOTSUPP;26 return -EOPNOTSUPP;
26}27}
27 28
29static inline int netdev_switch_port_stp_update(struct net_device *dev,
30 u8 state)
31{
32 return -EOPNOTSUPP;
33}
34
28#endif35#endif
29 36
30#endif /* _LINUX_SWITCHDEV_H_ */37#endif /* _LINUX_SWITCHDEV_H_ */
net/bridge/br_stp.c+7−0
@@ -12,6 +12,7 @@ · 11 unmodified lines
12 */12 */
13#include <linux/kernel.h>13#include <linux/kernel.h>
14#include <linux/rculist.h>14#include <linux/rculist.h>
15#include <net/switchdev.h>
15 16
16#include "br_private.h"17#include "br_private.h"
17#include "br_private_stp.h"18#include "br_private_stp.h"
@@ -38,7 +39,13 @@ void br_log_state(const struct net_bridge_port *p) · 20 unmodified lines
38 39
39void br_set_state(struct net_bridge_port *p, unsigned int state)40void br_set_state(struct net_bridge_port *p, unsigned int state)
40{41{
42 int err;
43
41 p->state = state;44 p->state = state;
45 err = netdev_switch_port_stp_update(p->dev, state);
46 if (err && err != -EOPNOTSUPP)
47 br_warn(p->br, "error setting offload STP state on port %u(%s)\n",
48 (unsigned int) p->port_no, p->dev->name);
42}49}
43 50
44/* called under bridge lock */51/* called under bridge lock */
net/switchdev/switchdev.c+19−0
@@ -31,3 +31,22 @@ int netdev_switch_parent_id_get(struct net_device *dev, · 30 unmodified lines
31 return ops->ndo_switch_parent_id_get(dev, psid);31 return ops->ndo_switch_parent_id_get(dev, psid);
32}32}
33EXPORT_SYMBOL(netdev_switch_parent_id_get);33EXPORT_SYMBOL(netdev_switch_parent_id_get);
34
35/**
36 * netdev_switch_port_stp_update - Notify switch device port of STP
37 * state change
38 * @dev: port device
39 * @state: port STP state
40 *
41 * Notify switch device port of bridge port STP state change.
42 */
43int netdev_switch_port_stp_update(struct net_device *dev, u8 state)
44{
45 const struct net_device_ops *ops = dev->netdev_ops;
46
47 if (!ops->ndo_switch_port_stp_update)
48 return -EOPNOTSUPP;
49 WARN_ON(!ops->ndo_switch_parent_id_get);
50 return ops->ndo_switch_port_stp_update(dev, state);
51}
52EXPORT_SYMBOL(netdev_switch_port_stp_update);