cxgb4: Add flag tc_flower_initialized

Add flag tc_flower_initialized to indicate the
completion if tc flower initialization.

Signed-off-by: Casey Leedom <leedom@chelsio.com>
Signed-off-by: Ganesh Goudar <ganeshgr@chelsio.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h b/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
index 1adb968b8354c258c90caeb7e60c9d7d8d015694..f27b2f0ade0b4b5b218ac3f08b1abeb81797ec86 100644 (file)
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
@@ -957,6 +957,7 @@ struct adapter {
        struct chcr_stats_debug chcr_stats;
 
        /* TC flower offload */
+       bool tc_flower_initialized;
        struct rhashtable flower_tbl;
        struct rhashtable_params flower_ht_params;
        struct timer_list flower_stats_timer;

diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c
index 3ddd2c4acf6846e38697fde2f09f1b3aa300dbe6..623f73dd7738dbbb01b8f49649a4507d641b1d9a 100644 (file)
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c
@@ -874,6 +874,9 @@ int cxgb4_init_tc_flower(struct adapter *adap)
 {
        int ret;
 
+       if (adap->tc_flower_initialized)
+               return -EEXIST;
+
        adap->flower_ht_params = cxgb4_tc_flower_ht_params;
        ret = rhashtable_init(&adap->flower_tbl, &adap->flower_ht_params);
        if (ret)
@@ -882,13 +885,18 @@ int cxgb4_init_tc_flower(struct adapter *adap)
        INIT_WORK(&adap->flower_stats_work, ch_flower_stats_handler);
        timer_setup(&adap->flower_stats_timer, ch_flower_stats_cb, 0);
        mod_timer(&adap->flower_stats_timer, jiffies + STATS_CHECK_PERIOD);
+       adap->tc_flower_initialized = true;
        return 0;
 }
 
 void cxgb4_cleanup_tc_flower(struct adapter *adap)
 {
+       if (!adap->tc_flower_initialized)
+               return;
+
        if (adap->flower_stats_timer.function)
                del_timer_sync(&adap->flower_stats_timer);
        cancel_work_sync(&adap->flower_stats_work);
        rhashtable_destroy(&adap->flower_tbl);
+       adap->tc_flower_initialized = false;
 }

diff --git a/drivers/net/ethernet/chelsio/cxgb4/sched.c b/drivers/net/ethernet/chelsio/cxgb4/sched.c
index 9148abb7994c8d9d91a75c01c286daa36ce9cd1b..7fc656680299703439d2e3bb590eaed762cd2afd 100644 (file)
--- a/drivers/net/ethernet/chelsio/cxgb4/sched.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/sched.c
@@ -539,6 +539,9 @@ void t4_cleanup_sched(struct adapter *adap)
                struct port_info *pi = netdev2pinfo(adap->port[j]);
 
                s = pi->sched_tbl;
+               if (!s)
+                       continue;
+
                for (i = 0; i < s->sched_size; i++) {
                        struct sched_class *e;