|
@@ -1591,13 +1591,9 @@ static int udp_seq_open(struct inode *inode, struct file *file)
|
|
|
|
|
|
s->family = afinfo->family;
|
|
s->family = afinfo->family;
|
|
s->hashtable = afinfo->hashtable;
|
|
s->hashtable = afinfo->hashtable;
|
|
- s->seq_ops.start = udp_seq_start;
|
|
|
|
- s->seq_ops.next = udp_seq_next;
|
|
|
|
- s->seq_ops.show = afinfo->seq_show;
|
|
|
|
- s->seq_ops.stop = udp_seq_stop;
|
|
|
|
s->p.net = net;
|
|
s->p.net = net;
|
|
|
|
|
|
- rc = seq_open(file, &s->seq_ops);
|
|
|
|
|
|
+ rc = seq_open(file, &afinfo->seq_ops);
|
|
if (rc)
|
|
if (rc)
|
|
goto out_put_net;
|
|
goto out_put_net;
|
|
|
|
|
|
@@ -1634,6 +1630,10 @@ int udp_proc_register(struct net *net, struct udp_seq_afinfo *afinfo)
|
|
afinfo->seq_fops->llseek = seq_lseek;
|
|
afinfo->seq_fops->llseek = seq_lseek;
|
|
afinfo->seq_fops->release = udp_seq_release;
|
|
afinfo->seq_fops->release = udp_seq_release;
|
|
|
|
|
|
|
|
+ afinfo->seq_ops.start = udp_seq_start;
|
|
|
|
+ afinfo->seq_ops.next = udp_seq_next;
|
|
|
|
+ afinfo->seq_ops.stop = udp_seq_stop;
|
|
|
|
+
|
|
p = proc_net_fops_create(net, afinfo->name, S_IRUGO, afinfo->seq_fops);
|
|
p = proc_net_fops_create(net, afinfo->name, S_IRUGO, afinfo->seq_fops);
|
|
if (p)
|
|
if (p)
|
|
p->data = afinfo;
|
|
p->data = afinfo;
|
|
@@ -1690,8 +1690,10 @@ static struct udp_seq_afinfo udp4_seq_afinfo = {
|
|
.name = "udp",
|
|
.name = "udp",
|
|
.family = AF_INET,
|
|
.family = AF_INET,
|
|
.hashtable = udp_hash,
|
|
.hashtable = udp_hash,
|
|
- .seq_show = udp4_seq_show,
|
|
|
|
.seq_fops = &udp4_seq_fops,
|
|
.seq_fops = &udp4_seq_fops,
|
|
|
|
+ .seq_ops = {
|
|
|
|
+ .show = udp4_seq_show,
|
|
|
|
+ },
|
|
};
|
|
};
|
|
|
|
|
|
static int udp4_proc_init_net(struct net *net)
|
|
static int udp4_proc_init_net(struct net *net)
|