]>
Commit | Line | Data |
---|---|---|
0fca2e6c | 1 | # This is a BitKeeper generated patch for the following project: |
2 | # Project Name: Linux kernel tree | |
3 | # This patch format is intended for GNU patch command version 2.5 or higher. | |
4 | # This patch includes the following deltas: | |
5 | # ChangeSet 1.1340.1.34 -> 1.1340.1.35 | |
6 | # net/llc/af_llc.c 1.50 -> 1.51 | |
7 | # net/llc/llc_proc.c 1.17 -> 1.18 | |
8 | # include/net/llc_proc.h 1.1 -> 1.3 net/llc/llc_proc.h (moved) | |
9 | # | |
10 | # The following is the BitKeeper ChangeSet Log | |
11 | # -------------------------------------------- | |
12 | # 03/10/17 noah@caltech.edu 1.1340.1.35 | |
13 | # Move include/net/llc_proc.h to net/llc/llc_proc.h since it is a private | |
14 | # header file. Add static inline stub functions to that header and remove | |
15 | # the extern stub functions from llc_proc.c This fixes a link error and | |
16 | # saves space. Also mark two private structs in llc_proc.c static. | |
17 | # -------------------------------------------- | |
18 | # | |
19 | diff -Nru a/include/net/llc_proc.h b/include/net/llc_proc.h | |
20 | --- a/include/net/llc_proc.h Fri Oct 17 16:24:05 2003 | |
21 | +++ /dev/null Wed Dec 31 16:00:00 1969 | |
22 | @@ -1,18 +0,0 @@ | |
23 | -#ifndef LLC_PROC_H | |
24 | -#define LLC_PROC_H | |
25 | -/* | |
26 | - * Copyright (c) 1997 by Procom Technology, Inc. | |
27 | - * 2002 by Arnaldo Carvalho de Melo <acme@conectiva.com.br> | |
28 | - * | |
29 | - * This program can be redistributed or modified under the terms of the | |
30 | - * GNU General Public License as published by the Free Software Foundation. | |
31 | - * This program is distributed without any warranty or implied warranty | |
32 | - * of merchantability or fitness for a particular purpose. | |
33 | - * | |
34 | - * See the GNU General Public License for more details. | |
35 | - */ | |
36 | - | |
37 | -extern int llc_proc_init(void); | |
38 | -extern void llc_proc_exit(void); | |
39 | - | |
40 | -#endif /* LLC_PROC_H */ | |
41 | diff -Nru a/net/llc/af_llc.c b/net/llc/af_llc.c | |
42 | --- a/net/llc/af_llc.c Fri Oct 17 16:24:05 2003 | |
43 | +++ b/net/llc/af_llc.c Fri Oct 17 16:24:05 2003 | |
44 | @@ -30,7 +30,7 @@ | |
45 | #include <net/llc_sap.h> | |
46 | #include <net/llc_pdu.h> | |
47 | #include <net/llc_conn.h> | |
48 | -#include <net/llc_proc.h> | |
49 | +#include "llc_proc.h" | |
50 | ||
51 | /* remember: uninitialized global data is zeroed because its in .bss */ | |
52 | static u16 llc_ui_sap_last_autoport = LLC_SAP_DYN_START; | |
53 | diff -Nru a/net/llc/llc_proc.c b/net/llc/llc_proc.c | |
54 | --- a/net/llc/llc_proc.c Fri Oct 17 16:24:05 2003 | |
55 | +++ b/net/llc/llc_proc.c Fri Oct 17 16:24:05 2003 | |
56 | @@ -14,7 +14,6 @@ | |
57 | ||
58 | #include <linux/config.h> | |
59 | #include <linux/init.h> | |
60 | -#ifdef CONFIG_PROC_FS | |
61 | #include <linux/kernel.h> | |
62 | #include <linux/proc_fs.h> | |
63 | #include <linux/errno.h> | |
64 | @@ -193,14 +192,14 @@ | |
65 | return 0; | |
66 | } | |
67 | ||
68 | -struct seq_operations llc_seq_socket_ops = { | |
69 | +static struct seq_operations llc_seq_socket_ops = { | |
70 | .start = llc_seq_start, | |
71 | .next = llc_seq_next, | |
72 | .stop = llc_seq_stop, | |
73 | .show = llc_seq_socket_show, | |
74 | }; | |
75 | ||
76 | -struct seq_operations llc_seq_core_ops = { | |
77 | +static struct seq_operations llc_seq_core_ops = { | |
78 | .start = llc_seq_start, | |
79 | .next = llc_seq_next, | |
80 | .stop = llc_seq_stop, | |
81 | @@ -273,13 +272,3 @@ | |
82 | remove_proc_entry("core", llc_proc_dir); | |
83 | remove_proc_entry("llc", proc_net); | |
84 | } | |
85 | -#else /* CONFIG_PROC_FS */ | |
86 | -int __init llc_proc_init(void) | |
87 | -{ | |
88 | - return 0; | |
89 | -} | |
90 | - | |
91 | -void llc_proc_exit(void) | |
92 | -{ | |
93 | -} | |
94 | -#endif /* CONFIG_PROC_FS */ | |
95 | diff -Nru a/net/llc/llc_proc.h b/net/llc/llc_proc.h | |
96 | --- /dev/null Wed Dec 31 16:00:00 1969 | |
97 | +++ b/net/llc/llc_proc.h Fri Oct 17 16:24:05 2003 | |
98 | @@ -0,0 +1,23 @@ | |
99 | +#ifndef LLC_PROC_H | |
100 | +#define LLC_PROC_H | |
101 | +/* | |
102 | + * Copyright (c) 1997 by Procom Technology, Inc. | |
103 | + * 2002 by Arnaldo Carvalho de Melo <acme@conectiva.com.br> | |
104 | + * | |
105 | + * This program can be redistributed or modified under the terms of the | |
106 | + * GNU General Public License as published by the Free Software Foundation. | |
107 | + * This program is distributed without any warranty or implied warranty | |
108 | + * of merchantability or fitness for a particular purpose. | |
109 | + * | |
110 | + * See the GNU General Public License for more details. | |
111 | + */ | |
112 | + | |
113 | +#ifdef CONFIG_PROC_FS | |
114 | +extern int llc_proc_init(void); | |
115 | +extern void llc_proc_exit(void); | |
116 | +#else /* CONFIG_PROC_FS */ | |
117 | +static inline int llc_proc_init(void) { return 0; } | |
118 | +static inline void llc_proc_exit(void) { } | |
119 | +#endif /* CONFIG_PROC_FS */ | |
120 | + | |
121 | +#endif /* LLC_PROC_H */ |