Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 45da1ca2 authored by Arjun V's avatar Arjun V Committed by David S. Miller
Browse files

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: default avatarArjun V <arjun@chelsio.com>
Signed-off-by: default avatarRahul Lakkireddy <rahul.lakkireddy@chelsio.com>
Signed-off-by: default avatarCasey Leedom <leedom@chelsio.com>
Signed-off-by: default avatarGanesh Goudar <ganeshgr@chelsio.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b973154a

drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c

+1 −2
Original line number Diff line number Diff line
@@ -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");

drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_u32.c

+5 −7
Original line number Diff line number Diff line
@@ -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)

drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_u32.h

+1 −4
Original line number Diff line number Diff line
@@ -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 */