diff options
Diffstat (limited to 'net/decnet')
-rw-r--r-- | net/decnet/dn_neigh.c | 6 | ||||
-rw-r--r-- | net/decnet/dn_route.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/net/decnet/dn_neigh.c b/net/decnet/dn_neigh.c index e851b143cca3..1ca13b17974d 100644 --- a/net/decnet/dn_neigh.c +++ b/net/decnet/dn_neigh.c | |||
@@ -580,8 +580,8 @@ static const struct seq_operations dn_neigh_seq_ops = { | |||
580 | 580 | ||
581 | static int dn_neigh_seq_open(struct inode *inode, struct file *file) | 581 | static int dn_neigh_seq_open(struct inode *inode, struct file *file) |
582 | { | 582 | { |
583 | return seq_open_private(file, &dn_neigh_seq_ops, | 583 | return seq_open_net(inode, file, &dn_neigh_seq_ops, |
584 | sizeof(struct neigh_seq_state)); | 584 | sizeof(struct neigh_seq_state)); |
585 | } | 585 | } |
586 | 586 | ||
587 | static const struct file_operations dn_neigh_seq_fops = { | 587 | static const struct file_operations dn_neigh_seq_fops = { |
@@ -589,7 +589,7 @@ static const struct file_operations dn_neigh_seq_fops = { | |||
589 | .open = dn_neigh_seq_open, | 589 | .open = dn_neigh_seq_open, |
590 | .read = seq_read, | 590 | .read = seq_read, |
591 | .llseek = seq_lseek, | 591 | .llseek = seq_lseek, |
592 | .release = seq_release_private, | 592 | .release = seq_release_net, |
593 | }; | 593 | }; |
594 | 594 | ||
595 | #endif | 595 | #endif |
diff --git a/net/decnet/dn_route.c b/net/decnet/dn_route.c index 1ae5efcdbd5f..938ba7da217c 100644 --- a/net/decnet/dn_route.c +++ b/net/decnet/dn_route.c | |||
@@ -984,7 +984,7 @@ source_ok: | |||
984 | * here | 984 | * here |
985 | */ | 985 | */ |
986 | if (!try_hard) { | 986 | if (!try_hard) { |
987 | neigh = neigh_lookup_nodev(&dn_neigh_table, &fl.fld_dst); | 987 | neigh = neigh_lookup_nodev(&dn_neigh_table, &init_net, &fl.fld_dst); |
988 | if (neigh) { | 988 | if (neigh) { |
989 | if ((oldflp->oif && | 989 | if ((oldflp->oif && |
990 | (neigh->dev->ifindex != oldflp->oif)) || | 990 | (neigh->dev->ifindex != oldflp->oif)) || |