Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:

	net/mac80211/rc80211_pid_algo.c

1 files changed, 3 insertions, 6 deletions

diff --git a/net/sctp/proc.c b/net/sctp/proc.c
index b99bb6bda5d..ddca90e5e3a 100644
--- a/net/sctp/proc.c
+++ b/net/sctp/proc.c
@@ -256,12 +256,10 @@ int __init sctp_eps_proc_init(void)
 {
         struct proc_dir_entry *p;
 
-        p = create_proc_entry("eps", S_IRUGO, proc_net_sctp);
+        p = proc_create("eps", S_IRUGO, proc_net_sctp, &sctp_eps_seq_fops);
         if (!p)
                 return -ENOMEM;
 
-        p->proc_fops = &sctp_eps_seq_fops;
-
         return 0;
 }
 
@@ -375,12 +373,11 @@ int __init sctp_assocs_proc_init(void)
 {
         struct proc_dir_entry *p;
 
-        p = create_proc_entry("assocs", S_IRUGO, proc_net_sctp);
+        p = proc_create("assocs", S_IRUGO, proc_net_sctp,
+                        &sctp_assocs_seq_fops);
         if (!p)
                 return -ENOMEM;
 
-        p->proc_fops = &sctp_assocs_seq_fops;
-
         return 0;
 }