diff options
| author | chas williams - CONTRACTOR <chas@cmf.nrl.navy.mil> | 2009-12-04 05:22:17 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-08 20:22:31 -0800 |
| commit | 504bb3b58e7314e0fe026da280e8168c1314be3d (patch) | |
| tree | 8d82bbf0d2b41ba6d80ae518ef72b641621e987a /drivers/atm | |
| parent | eb0445887a45a3705522aac6c2d8367e90358792 (diff) | |
| download | linux-stable-504bb3b58e7314e0fe026da280e8168c1314be3d.tar.gz linux-stable-504bb3b58e7314e0fe026da280e8168c1314be3d.tar.bz2 linux-stable-504bb3b58e7314e0fe026da280e8168c1314be3d.zip | |
atm: [he] adjust tests to account for sk_wmem_alloc changes
due to reference counting sk_wmem_alloc now has a value of 1 when all
the outstanding data has been sent.
Signed-off-by: Chas Williams - CONTRACTOR <chas@cmf.nrl.navy.mil>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/atm')
| -rw-r--r-- | drivers/atm/he.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/atm/he.c b/drivers/atm/he.c index e90665876c47..e8c6529dc366 100644 --- a/drivers/atm/he.c +++ b/drivers/atm/he.c @@ -2505,7 +2505,7 @@ he_close(struct atm_vcc *vcc) * TBRQ, the host issues the close command to the adapter. */ - while (((tx_inuse = atomic_read(&sk_atm(vcc)->sk_wmem_alloc)) > 0) && + while (((tx_inuse = atomic_read(&sk_atm(vcc)->sk_wmem_alloc)) > 1) && (retry < MAX_RETRY)) { msleep(sleep); if (sleep < 250) @@ -2514,7 +2514,7 @@ he_close(struct atm_vcc *vcc) ++retry; } - if (tx_inuse) + if (tx_inuse > 1) hprintk("close tx cid 0x%x tx_inuse = %d\n", cid, tx_inuse); /* 2.3.1.1 generic close operations with flush */ |