projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into upstream
[powerpc.git]
/
net
/
atm
/
clip.c
diff --git
a/net/atm/clip.c
b/net/atm/clip.c
index
1a786bf
..
f92f9c9
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) {
@@
-122,7
+122,7
@@
static void unlink_clip_vcc(struct clip_vcc *clip_vcc)
printk(KERN_CRIT "ATMARP: unlink_clip_vcc failed (entry %p, vcc "
"0x%p)\n", entry, clip_vcc);
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
);
+
netif_tx_unlock_bh(entry->neigh->dev
);
}
/* The neighbour entry n->lock is held. */
}
/* The neighbour entry n->lock is held. */
@@
-963,7
+963,7
@@
static struct file_operations arp_seq_fops = {
static int __init atm_clip_init(void)
{
struct proc_dir_entry *p;
static int __init atm_clip_init(void)
{
struct proc_dir_entry *p;
- neigh_table_init(&clip_tbl);
+ neigh_table_init
_no_netlink
(&clip_tbl);
clip_tbl_hook = &clip_tbl;
register_atm_ioctl(&clip_ioctl_ops);
clip_tbl_hook = &clip_tbl;
register_atm_ioctl(&clip_ioctl_ops);