[NETFILTER]: Add partial checksum validation helper

[mv-sheeva.git] / net / ipv4 / udp.c

diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index 80007c79f12faa5330a30bacbc6bbe53ae3cb089..7b7fcacec4a024fed80b20e5c9f4bbba81d89b34 100644 (file)
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -231,7 +231,7 @@ gotit:
        if (sk_unhashed(sk)) {
                head = &udptable[snum & (UDP_HTABLE_SIZE - 1)];
                sk_add_node(sk, head);
-               sock_prot_inuse_add(sk->sk_prot, 1);
+               sock_prot_inuse_add(sock_net(sk), sk->sk_prot, 1);
        }
        error = 0;
 fail:
@@ -1467,8 +1467,6 @@ unsigned int udp_poll(struct file *file, struct socket *sock, poll_table *wait)
 
 }
 
-DEFINE_PROTO_INUSE(udp)
-
 struct proto udp_prot = {
        .name              = "UDP",
        .owner             = THIS_MODULE,
@@ -1496,7 +1494,6 @@ struct proto udp_prot = {
        .compat_setsockopt = compat_udp_setsockopt,
        .compat_getsockopt = compat_udp_getsockopt,
 #endif
-       REF_PROTO_INUSE(udp)
 };
 
 /* ------------------------------------------------------------------------ */
@@ -1506,7 +1503,7 @@ static struct sock *udp_get_first(struct seq_file *seq)
 {
        struct sock *sk;
        struct udp_iter_state *state = seq->private;
-       struct net *net = state->net;
+       struct net *net = seq_file_net(seq);
 
        for (state->bucket = 0; state->bucket < UDP_HTABLE_SIZE; ++state->bucket) {
                struct hlist_node *node;
@@ -1525,7 +1522,7 @@ found:
 static struct sock *udp_get_next(struct seq_file *seq, struct sock *sk)
 {
        struct udp_iter_state *state = seq->private;
-       struct net *net = state->net;
+       struct net *net = seq_file_net(seq);
 
        do {
                sk = sk_next(sk);
@@ -1554,14 +1551,14 @@ static void *udp_seq_start(struct seq_file *seq, loff_t *pos)
        __acquires(udp_hash_lock)
 {
        read_lock(&udp_hash_lock);
-       return *pos ? udp_get_idx(seq, *pos-1) : (void *)1;
+       return *pos ? udp_get_idx(seq, *pos-1) : SEQ_START_TOKEN;
 }
 
 static void *udp_seq_next(struct seq_file *seq, void *v, loff_t *pos)
 {
        struct sock *sk;
 
-       if (v == (void *)1)
+       if (v == SEQ_START_TOKEN)
                sk = udp_get_idx(seq, 0);
        else
                sk = udp_get_next(seq, v);
@@ -1579,50 +1576,18 @@ static void udp_seq_stop(struct seq_file *seq, void *v)
 static int udp_seq_open(struct inode *inode, struct file *file)
 {
        struct udp_seq_afinfo *afinfo = PDE(inode)->data;
-       struct seq_file *seq;
-       struct net *net;
-       int rc = -ENOMEM;
-       struct udp_iter_state *s = kzalloc(sizeof(*s), GFP_KERNEL);
-
-       if (!s)
-               goto out;
+       struct udp_iter_state *s;
+       int err;
 
-       rc = -ENXIO;
-       net = get_proc_net(inode);
-       if (!net)
-               goto out_kfree;
+       err = seq_open_net(inode, file, &afinfo->seq_ops,
+                          sizeof(struct udp_iter_state));
+       if (err < 0)
+               return err;
 
+       s = ((struct seq_file *)file->private_data)->private;
        s->family               = afinfo->family;
        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->net                  = net;
-
-       rc = seq_open(file, &s->seq_ops);
-       if (rc)
-               goto out_put_net;
-
-       seq = file->private_data;
-       seq->private = s;
-out:
-       return rc;
-out_put_net:
-       put_net(net);
-out_kfree:
-       kfree(s);
-       goto out;
-}
-
-static int udp_seq_release(struct inode *inode, struct file *file)
-{
-       struct seq_file *seq = file->private_data;
-       struct udp_iter_state *s = seq->private;
-
-       put_net(s->net);
-       seq_release_private(inode, file);
-       return 0;
+       return err;
 }
 
 /* ------------------------------------------------------------------------ */
@@ -1631,15 +1596,16 @@ int udp_proc_register(struct net *net, struct udp_seq_afinfo *afinfo)
        struct proc_dir_entry *p;
        int rc = 0;
 
-       if (!afinfo)
-               return -EINVAL;
-       afinfo->seq_fops->owner         = afinfo->owner;
-       afinfo->seq_fops->open          = udp_seq_open;
-       afinfo->seq_fops->read          = seq_read;
-       afinfo->seq_fops->llseek        = seq_lseek;
-       afinfo->seq_fops->release       = udp_seq_release;
+       afinfo->seq_fops.open           = udp_seq_open;
+       afinfo->seq_fops.read           = seq_read;
+       afinfo->seq_fops.llseek         = seq_lseek;
+       afinfo->seq_fops.release        = seq_release_net;
+
+       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)
                p->data = afinfo;
        else
@@ -1649,10 +1615,7 @@ int udp_proc_register(struct net *net, struct udp_seq_afinfo *afinfo)
 
 void udp_proc_unregister(struct net *net, struct udp_seq_afinfo *afinfo)
 {
-       if (!afinfo)
-               return;
        proc_net_remove(net, afinfo->name);
-       memset(afinfo->seq_fops, 0, sizeof(*afinfo->seq_fops));
 }
 
 /* ------------------------------------------------------------------------ */
@@ -1691,14 +1654,16 @@ int udp4_seq_show(struct seq_file *seq, void *v)
 }
 
 /* ------------------------------------------------------------------------ */
-static struct file_operations udp4_seq_fops;
 static struct udp_seq_afinfo udp4_seq_afinfo = {
-       .owner          = THIS_MODULE,
        .name           = "udp",
        .family         = AF_INET,
        .hashtable      = udp_hash,
-       .seq_show       = udp4_seq_show,
-       .seq_fops       = &udp4_seq_fops,
+       .seq_fops       = {
+               .owner  =       THIS_MODULE,
+       },
+       .seq_ops        = {
+               .show           = udp4_seq_show,
+       },
 };
 
 static int udp4_proc_init_net(struct net *net)