|
|
@@ -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 (family == PF_INET)
|
|
|
- t->stids_in_use--;
|
|
|
- else
|
|
|
- t->stids_in_use -= 4;
|
|
|
+ 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);
|