net: bridge: add helper to offload ageing time

[sfrench/cifs-2.6.git] / net / bridge / br_stp_if.c

diff --git a/net/bridge/br_stp_if.c b/net/bridge/br_stp_if.c
index d8ad73b38de27b49374862cca33954534606d486..2efbba549195e2e84090ecb22ddcfa8d85751261 100644 (file)
--- a/net/bridge/br_stp_if.c
+++ b/net/bridge/br_stp_if.c
@@ -36,12 +36,6 @@ static inline port_id br_make_port_id(__u8 priority, __u16 port_no)
 /* called under bridge lock */
 void br_init_port(struct net_bridge_port *p)
 {
-       struct switchdev_attr attr = {
-               .orig_dev = p->dev,
-               .id = SWITCHDEV_ATTR_ID_BRIDGE_AGEING_TIME,
-               .flags = SWITCHDEV_F_SKIP_EOPNOTSUPP | SWITCHDEV_F_DEFER,
-               .u.ageing_time = jiffies_to_clock_t(p->br->ageing_time),
-       };
        int err;
 
        p->port_id = br_make_port_id(p->priority, p->port_no);
@@ -50,9 +44,9 @@ void br_init_port(struct net_bridge_port *p)
        p->topology_change_ack = 0;
        p->config_pending = 0;
 
-       err = switchdev_port_attr_set(p->dev, &attr);
-       if (err && err != -EOPNOTSUPP)
-               netdev_err(p->dev, "failed to set HW ageing time\n");
+       err = __set_ageing_time(p->dev, p->br->ageing_time);
+       if (err)
+               netdev_err(p->dev, "failed to offload ageing time\n");
 }
 
 /* NO locks held */