cxgb4: Increase max number of tc u32 links

Make max number of supported tc u32 links equal to max number of filters
supported by hardware.

Signed-off-by: Arjun V <arjun@chelsio.com>
Signed-off-by: Rahul Lakkireddy <rahul.lakkireddy@chelsio.com>
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_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
index 8ba3dc2e236cc05d2867f78603ec007fec22d05a..afb0967d2ce60cafab81701e057017b96a700bbc 100644 (file)
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
@@ -4907,8 +4907,7 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
                         "continuing\n");
                adapter->params.offload = 0;
        } else {
-               adapter->tc_u32 = cxgb4_init_tc_u32(adapter,
-                                                   CXGB4_MAX_LINK_HANDLE);
+               adapter->tc_u32 = cxgb4_init_tc_u32(adapter);
                if (!adapter->tc_u32)
                        dev_warn(&pdev->dev,
                                 "could not offload tc u32, continuing\n");

diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_u32.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_u32.c
index 52af62e0ecb6bf01cdeffa0efc15e9870c134de2..a1b19422b3395fa0645d7d0ede4ae461af644599 100644 (file)
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_u32.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_u32.c
@@ -437,28 +437,26 @@ void cxgb4_cleanup_tc_u32(struct adapter *adap)
        t4_free_mem(adap->tc_u32);
 }
 
-struct cxgb4_tc_u32_table *cxgb4_init_tc_u32(struct adapter *adap,
-                                            unsigned int size)
+struct cxgb4_tc_u32_table *cxgb4_init_tc_u32(struct adapter *adap)
 {
+       unsigned int max_tids = adap->tids.nftids;
        struct cxgb4_tc_u32_table *t;
        unsigned int i;
 
-       if (!size)
+       if (!max_tids)
                return NULL;
 
        t = t4_alloc_mem(sizeof(*t) +
-                        (size * sizeof(struct cxgb4_link)));
+                        (max_tids * sizeof(struct cxgb4_link)));
        if (!t)
                return NULL;
 
-       t->size = size;
+       t->size = max_tids;
 
        for (i = 0; i < t->size; i++) {
                struct cxgb4_link *link = &t->table[i];
                unsigned int bmap_size;
-               unsigned int max_tids;
 
-               max_tids = adap->tids.nftids;
                bmap_size = BITS_TO_LONGS(max_tids);
                link->tid_map = t4_alloc_mem(sizeof(unsigned long) * bmap_size);
                if (!link->tid_map)

diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_u32.h b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_u32.h
index 6bdc885eff2253f5ea27673200a8d633e2dbf491..021261a41c1312f6bd43fa3cc58dddc73eb023db 100644 (file)
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_u32.h
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_u32.h
@@ -37,8 +37,6 @@
 
 #include <net/pkt_cls.h>
 
-#define CXGB4_MAX_LINK_HANDLE 32
-
 static inline bool can_tc_u32_offload(struct net_device *dev)
 {
        struct adapter *adap = netdev2adap(dev);
@@ -52,6 +50,5 @@ int cxgb4_delete_knode(struct net_device *dev, __be16 protocol,
                       struct tc_cls_u32_offload *cls);
 
 void cxgb4_cleanup_tc_u32(struct adapter *adapter);
-struct cxgb4_tc_u32_table *cxgb4_init_tc_u32(struct adapter *adap,
-                                            unsigned int size);
+struct cxgb4_tc_u32_table *cxgb4_init_tc_u32(struct adapter *adap);
 #endif /* __CXGB4_TC_U32_H */