rocker: move ageing_time from struct rocker to struct ofdpa

This is OF-DPA specific, used only there, similar to
ofdpa_port->ageing_time. So move it to OF-DPA code.

Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/rocker/rocker.h b/drivers/net/ethernet/rocker/rocker.h
index 011f1b6f91bb5b62a4f9360af31cc65dfa28f73b..1ab995f7146b3d1028465b7af61cfcb08f3f151a 100644 (file)
--- a/drivers/net/ethernet/rocker/rocker.h
+++ b/drivers/net/ethernet/rocker/rocker.h
@@ -63,7 +63,6 @@ struct rocker {
        struct {
                u64 id;
        } hw;
-       unsigned long ageing_time;
        spinlock_t cmd_ring_lock;               /* for cmd ring accesses */
        struct rocker_dma_ring_info cmd_ring;
        struct rocker_dma_ring_info event_ring;

diff --git a/drivers/net/ethernet/rocker/rocker_main.c b/drivers/net/ethernet/rocker/rocker_main.c
index c8b1bf474e89a126c1dcc20275a51ddabc395ee3..28b775e5a9ad459ccd4e1a6dc1ebe5fde4df7cd1 100644 (file)
--- a/drivers/net/ethernet/rocker/rocker_main.c
+++ b/drivers/net/ethernet/rocker/rocker_main.c
@@ -2733,8 +2733,6 @@ static int rocker_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 
        rocker->hw.id = rocker_read64(rocker, SWITCH_ID);
 
-       rocker->ageing_time = BR_DEFAULT_AGEING_TIME;
-
        err = rocker_probe_ports(rocker);
        if (err) {
                dev_err(&pdev->dev, "failed to probe ports\n");

diff --git a/drivers/net/ethernet/rocker/rocker_ofdpa.c b/drivers/net/ethernet/rocker/rocker_ofdpa.c
index cfde525d9123e1f1b8f0102874d1dfd12b80d485..0e758bcb26b01546ad90ac5111e2a40d09a373ef 100644 (file)
--- a/drivers/net/ethernet/rocker/rocker_ofdpa.c
+++ b/drivers/net/ethernet/rocker/rocker_ofdpa.c
@@ -188,6 +188,7 @@ struct ofdpa {
        DECLARE_HASHTABLE(neigh_tbl, 16);
        spinlock_t neigh_tbl_lock;              /* for neigh tbl accesses */
        u32 neigh_tbl_next_index;
+       unsigned long ageing_time;
 };
 
 struct ofdpa_port {
@@ -2105,7 +2106,7 @@ static void ofdpa_fdb_cleanup(unsigned long data)
        struct ofdpa_port *ofdpa_port;
        struct ofdpa_fdb_tbl_entry *entry;
        struct hlist_node *tmp;
-       unsigned long next_timer = jiffies + ofdpa->rocker->ageing_time;
+       unsigned long next_timer = jiffies + ofdpa->ageing_time;
        unsigned long expires;
        unsigned long lock_flags;
        int flags = OFDPA_OP_FLAG_NOWAIT | OFDPA_OP_FLAG_REMOVE |
@@ -2492,6 +2493,8 @@ static int ofdpa_init(struct rocker *rocker)
                    (unsigned long) ofdpa);
        mod_timer(&ofdpa->fdb_cleanup_timer, jiffies);
 
+       ofdpa->ageing_time = BR_DEFAULT_AGEING_TIME;
+
        return 0;
 }
 
@@ -2648,12 +2651,12 @@ ofdpa_port_attr_bridge_ageing_time_set(struct rocker_port *rocker_port,
                                       struct switchdev_trans *trans)
 {
        struct ofdpa_port *ofdpa_port = rocker_port->wpriv;
-       struct rocker *rocker = rocker_port->rocker;
+       struct ofdpa *ofdpa = ofdpa_port->ofdpa;
 
        if (!switchdev_trans_ph_prepare(trans)) {
                ofdpa_port->ageing_time = clock_t_to_jiffies(ageing_time);
-               if (ofdpa_port->ageing_time < rocker->ageing_time)
-                       rocker->ageing_time = ofdpa_port->ageing_time;
+               if (ofdpa_port->ageing_time < ofdpa->ageing_time)
+                       ofdpa->ageing_time = ofdpa_port->ageing_time;
                mod_timer(&ofdpa_port->ofdpa->fdb_cleanup_timer, jiffies);
        }