git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.17-1.2187_FC5 patched with stable patch-2.6.17.13-vs2...
[linux-2.6.git]
/
net
/
atm
/
clip.c
diff --git
a/net/atm/clip.c
b/net/atm/clip.c
index
72d8529
..
4f44e98
100644
(file)
--- a/
net/atm/clip.c
+++ b/
net/atm/clip.c
@@
-98,7
+98,7
@@
static void unlink_clip_vcc(struct clip_vcc *clip_vcc)
printk(KERN_CRIT "!clip_vcc->entry (clip_vcc %p)\n", clip_vcc);
return;
}
printk(KERN_CRIT "!clip_vcc->entry (clip_vcc %p)\n", clip_vcc);
return;
}
-
spin_lock_bh(&entry->neigh->dev->xmit_lock
); /* block clip_start_xmit() */
+
netif_tx_lock_bh(entry->neigh->dev
); /* block clip_start_xmit() */
entry->neigh->used = jiffies;
for (walk = &entry->vccs; *walk; walk = &(*walk)->next)
if (*walk == clip_vcc) {
entry->neigh->used = jiffies;
for (walk = &entry->vccs; *walk; walk = &(*walk)->next)
if (*walk == clip_vcc) {
@@
-120,9
+120,9
@@
static void unlink_clip_vcc(struct clip_vcc *clip_vcc)
goto out;
}
printk(KERN_CRIT "ATMARP: unlink_clip_vcc failed (entry %p, vcc "
goto out;
}
printk(KERN_CRIT "ATMARP: unlink_clip_vcc failed (entry %p, vcc "
-
"0x%p)\n", entry,
clip_vcc);
-
out:
-
spin_unlock_bh(&entry->neigh->dev->xmit_lock
);
+
"0x%p)\n",entry,
clip_vcc);
+out:
+
netif_tx_unlock_bh(entry->neigh->dev
);
}
/* The neighbour entry n->lock is held. */
}
/* The neighbour entry n->lock is held. */