diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-29 08:56:47 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-29 08:56:47 -0700 |
| commit | eb693d2994eb762b2201aead31066265ab0be20b (patch) | |
| tree | 424e1e7f3d272d0fd5888435176b386594ce121f /net/atm/signaling.c | |
| parent | 6dec3cf5cdb600f39b9eac3349f6bf50eab87731 (diff) | |
| parent | 01d40f28b125e0a9aa0ec24642be67fc4c5dfaff (diff) | |
| download | blackbird-op-linux-eb693d2994eb762b2201aead31066265ab0be20b.tar.gz blackbird-op-linux-eb693d2994eb762b2201aead31066265ab0be20b.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/atm/signaling.c')
| -rw-r--r-- | net/atm/signaling.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/atm/signaling.c b/net/atm/signaling.c index f7c449ac1800..e7211a7f382c 100644 --- a/net/atm/signaling.c +++ b/net/atm/signaling.c @@ -217,8 +217,9 @@ void sigd_enq(struct atm_vcc *vcc,enum atmsvc_msg_type type, static void purge_vcc(struct atm_vcc *vcc) { if (sk_atm(vcc)->sk_family == PF_ATMSVC && - !test_bit(ATM_VF_META,&vcc->flags)) { - set_bit(ATM_VF_RELEASED,&vcc->flags); + !test_bit(ATM_VF_META, &vcc->flags)) { + set_bit(ATM_VF_RELEASED, &vcc->flags); + clear_bit(ATM_VF_REGIS, &vcc->flags); vcc_release_async(vcc, -EUNATCH); } } @@ -243,8 +244,7 @@ static void sigd_close(struct atm_vcc *vcc) sk_for_each(s, node, head) { struct atm_vcc *vcc = atm_sk(s); - if (vcc->dev) - purge_vcc(vcc); + purge_vcc(vcc); } } read_unlock(&vcc_sklist_lock); |
