[NETFILTER]: nf_nat: kill helper and seq_adjust hooks

[linux-2.6] / net / ipv4 / udp.c

diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index a95dff8063a4e987ce109ef21dfd2645c740a927..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:
@@ -1551,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);
@@ -1596,7 +1596,6 @@ int udp_proc_register(struct net *net, struct udp_seq_afinfo *afinfo)
        struct proc_dir_entry *p;
        int rc = 0;
 
-       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;
@@ -1656,10 +1655,12 @@ int udp4_seq_show(struct seq_file *seq, void *v)
 
 /* ------------------------------------------------------------------------ */
 static struct udp_seq_afinfo udp4_seq_afinfo = {
-       .owner          = THIS_MODULE,
        .name           = "udp",
        .family         = AF_INET,
        .hashtable      = udp_hash,
+       .seq_fops       = {
+               .owner  =       THIS_MODULE,
+       },
        .seq_ops        = {
                .show           = udp4_seq_show,
        },