diff options
author | David S. Miller <davem@davemloft.net> | 2008-03-05 15:26:41 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-03-05 15:26:41 -0500 |
commit | 255333c1db3ec63921de29b134418a4e56e5921e (patch) | |
tree | b1cd99373cabfa6fed020496d4d74500e7bc7e92 /net/sctp | |
parent | 9a43b709a230705ca40a6f854a334a02334a3c1c (diff) | |
parent | 0d66afe7805b169b6bf3c7a88cf8163298b8ef05 (diff) |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/mac80211/rc80211_pid_algo.c
Diffstat (limited to 'net/sctp')
-rw-r--r-- | net/sctp/proc.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/net/sctp/proc.c b/net/sctp/proc.c index b99bb6bda5d5..ddca90e5e3a5 100644 --- a/net/sctp/proc.c +++ b/net/sctp/proc.c | |||
@@ -256,12 +256,10 @@ int __init sctp_eps_proc_init(void) | |||
256 | { | 256 | { |
257 | struct proc_dir_entry *p; | 257 | struct proc_dir_entry *p; |
258 | 258 | ||
259 | p = create_proc_entry("eps", S_IRUGO, proc_net_sctp); | 259 | p = proc_create("eps", S_IRUGO, proc_net_sctp, &sctp_eps_seq_fops); |
260 | if (!p) | 260 | if (!p) |
261 | return -ENOMEM; | 261 | return -ENOMEM; |
262 | 262 | ||
263 | p->proc_fops = &sctp_eps_seq_fops; | ||
264 | |||
265 | return 0; | 263 | return 0; |
266 | } | 264 | } |
267 | 265 | ||
@@ -375,12 +373,11 @@ int __init sctp_assocs_proc_init(void) | |||
375 | { | 373 | { |
376 | struct proc_dir_entry *p; | 374 | struct proc_dir_entry *p; |
377 | 375 | ||
378 | p = create_proc_entry("assocs", S_IRUGO, proc_net_sctp); | 376 | p = proc_create("assocs", S_IRUGO, proc_net_sctp, |
377 | &sctp_assocs_seq_fops); | ||
379 | if (!p) | 378 | if (!p) |
380 | return -ENOMEM; | 379 | return -ENOMEM; |
381 | 380 | ||
382 | p->proc_fops = &sctp_assocs_seq_fops; | ||
383 | |||
384 | return 0; | 381 | return 0; |
385 | } | 382 | } |
386 | 383 | ||