Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[mv-sheeva.git] / include / net / udp.h

diff --git a/include/net/udp.h b/include/net/udp.h
index 0079d17fd3a3e8d74a670312790213143d21b7aa..3e55a99b0ba3836441804f33b7c6880d21a3d9cb 100644 (file)
--- a/include/net/udp.h
+++ b/include/net/udp.h
@@ -115,7 +115,7 @@ static inline void udp_lib_unhash(struct sock *sk)
        write_lock_bh(&udp_hash_lock);
        if (sk_del_node_init(sk)) {
                inet_sk(sk)->num = 0;
-               sock_prot_inuse_add(sk->sk_prot, -1);
+               sock_prot_inuse_add(sock_net(sk), sk->sk_prot, -1);
        }
        write_unlock_bh(&udp_hash_lock);
 }
@@ -185,11 +185,10 @@ DECLARE_SNMP_STAT(struct udp_mib, udplite_stats_in6);
 
 /* /proc */
 struct udp_seq_afinfo {
-       struct module           *owner;
        char                    *name;
        sa_family_t             family;
        struct hlist_head       *hashtable;
-       struct file_operations  *seq_fops;
+       struct file_operations  seq_fops;
        struct seq_operations   seq_ops;
 };