From 1f85673ac2cf791f56c92a320466750d54c3ec0e Mon Sep 17 00:00:00 2001 From: Pavel Emelyanov Date: Mon, 24 Mar 2008 14:57:45 -0700 Subject: [PATCH] --- yaml --- r: 90263 b: refs/heads/master c: 2feb27dbe00cbb4f7d31f90acf6bd0d751dd0a50 h: refs/heads/master i: 90261: 46606fcfa7803b36ee67f875e1d783455a326694 90259: 55857415c75053f933c849a92e9348cf13808e23 90255: 2d3c62dffdb6df9d3b97a2ed48b908b4c56a1ba5 v: v3 --- [refs] | 2 +- trunk/net/core/dev.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index a437bbb334e5..ea5cf02e1e13 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 84c375af0ff61e0bd15fac0aed0438640494483e +refs/heads/master: 2feb27dbe00cbb4f7d31f90acf6bd0d751dd0a50 diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c index f973e38b81af..aebd08606040 100644 --- a/trunk/net/core/dev.c +++ b/trunk/net/core/dev.c @@ -2615,7 +2615,7 @@ static int ptype_seq_show(struct seq_file *seq, void *v) if (v == SEQ_START_TOKEN) seq_puts(seq, "Type Device Function\n"); - else { + else if (pt->dev == NULL || pt->dev->nd_net == seq_file_net(seq)) { if (pt->type == htons(ETH_P_ALL)) seq_puts(seq, "ALL "); else @@ -2639,7 +2639,8 @@ static const struct seq_operations ptype_seq_ops = { static int ptype_seq_open(struct inode *inode, struct file *file) { - return seq_open(file, &ptype_seq_ops); + return seq_open_net(inode, file, &ptype_seq_ops, + sizeof(struct seq_net_private)); } static const struct file_operations ptype_seq_fops = { @@ -2647,7 +2648,7 @@ static const struct file_operations ptype_seq_fops = { .open = ptype_seq_open, .read = seq_read, .llseek = seq_lseek, - .release = seq_release, + .release = seq_release_net, };