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

Commit 2248b293 authored by Hariprasad Shenai's avatar Hariprasad Shenai Committed by David S. Miller
Browse files

cxgb4: Differentiate between stids between server and filter region 



For T4 adapter, offloaded servers tid for IPv4 connections are
allocated from filter region. So add a new field for server filter tid if
server tid is allocated from filter region.

Signed-off-by: default avatarHariprasad Shenai <hariprasad@chelsio.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9a1bb9f6

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

+10 −5
Original line number Diff line number Diff line
@@ -1548,7 +1548,7 @@ int cxgb4_alloc_sftid(struct tid_info *t, int family, void *data) 
		t->stid_tab[stid].data = data;

		stid -= t->nstids;

		stid += t->sftid_base;

		t->stids_in_use++;

		t->sftids_in_use++;

	}

	spin_unlock_bh(&t->stid_lock);

	return stid;
@@ -1573,10 +1573,14 @@ void cxgb4_free_stid(struct tid_info *t, unsigned int stid, int family) 
	else

		bitmap_release_region(t->stid_bmap, stid, 2);

	t->stid_tab[stid].data = NULL;

	if (stid < t->nstids) {

		if (family == PF_INET)

			t->stids_in_use--;

		else

			t->stids_in_use -= 4;

	} else {

		t->sftids_in_use--;

	}

	spin_unlock_bh(&t->stid_lock);

}

EXPORT_SYMBOL(cxgb4_free_stid);
@@ -1707,6 +1711,7 @@ static int tid_init(struct tid_info *t) 
	spin_lock_init(&t->atid_lock);



	t->stids_in_use = 0;

	t->sftids_in_use = 0;

	t->afree = NULL;

	t->atids_in_use = 0;

	atomic_set(&t->tids_in_use, 0);

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

+1 −0
Original line number Diff line number Diff line
@@ -117,6 +117,7 @@ struct tid_info { 


	spinlock_t stid_lock;

	unsigned int stids_in_use;

	unsigned int sftids_in_use;



	/* TIDs in the TCAM */

	atomic_t tids_in_use;