ipv4: convert /proc/net/raw to seq_file

Hi David,

Please pull from:

master.kernel.org:/home/acme/BK/net-2.5

Now there are three outstanding changesets there.

- Arnaldo

You can import this changeset into BK by piping this whole message to:
'| bk receive [path to repository]' or apply the patch as usual.

===================================================================

[email protected], 2002-11-14 12:48:56-02:00, [email protected]
o ipv4: convert /proc/net/raw to seq_file

Also:

. prototypes for _proc_init functions only needed in af_inet.c, and only
if CONFIG_PROC_FS is set.
. net/socket.c needs include <linux/seq_file.h>
. review raw.c needed includes

 include/linux/udp.h  |    3 
 include/net/ip_fib.h |    3 
 include/net/udp.h    |    2 
 net/ipv4/af_inet.c   |   16 ++-
 net/ipv4/fib_hash.c  |   12 --
 net/ipv4/raw.c       |  213 +++++++++++++++++++++++++++++++++++++--------------
 net/ipv4/udp.c       |   12 --
 net/socket.c         |    1 
 8 files changed, 166 insertions(+), 96 deletions(-)

diff -Nru a/include/linux/udp.h b/include/linux/udp.h
@@ -57,7 +57,4 @@
 
 #define udp_sk(__sk) (&((struct udp_sock *)__sk)->udp)
 
-extern int udp_proc_init(void);
-extern void udp_proc_exit(void);
-
 #endif	/* _LINUX_UDP_H */

diff -Nru a/include/net/ip_fib.h b/include/net/ip_fib.h
@@ -276,7 +276,4 @@
 #endif
 }
 
-extern int fib_proc_init(void);
-extern void fib_proc_exit(void);
-
 #endif  /* _NET_FIB_H */

diff -Nru a/include/net/udp.h b/include/net/udp.h
@@ -76,6 +76,4 @@
 #define UDP_INC_STATS_BH(field)		SNMP_INC_STATS_BH(udp_statistics, field)
 #define UDP_INC_STATS_USER(field) 	SNMP_INC_STATS_USER(udp_statistics, field)
 
-extern int udp_proc_init(void);
-
 #endif	/* _UDP_H */

diff -Nru a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
@@ -1160,16 +1160,20 @@
 /* ------------------------------------------------------------------------ */
 
 #ifdef CONFIG_PROC_FS
-
-extern int ip_misc_proc_init(void);
-extern int raw_get_info(char *, char **, off_t, int);
-extern int tcp_get_info(char *, char **, off_t, int);
+extern int  fib_proc_init(void);
+extern void fib_proc_exit(void);
+extern int  ip_misc_proc_init(void);
+extern int  raw_proc_init(void);
+extern void raw_proc_exit(void);
+extern int  tcp_get_info(char *buffer, char **start, off_t offset, int length);
+extern int  udp_proc_init(void);
+extern void udp_proc_exit(void);
 
 int __init ipv4_proc_init(void)
 {
 	int rc = 0;
 
-	if (!proc_net_create("raw", 0, raw_get_info))
+	if (raw_proc_init())
 		goto out_raw;
 	if (!proc_net_create("tcp", 0, tcp_get_info))
 		goto out_tcp;

@@ -1188,7 +1192,7 @@
 out_udp:
 	proc_net_remove("tcp");
 out_tcp:
-	proc_net_remove("raw");
+	raw_proc_exit();
 out_raw:
 	rc = -ENOMEM;
 	goto out;

diff -Nru a/net/ipv4/fib_hash.c b/net/ipv4/fib_hash.c
@@ -1092,16 +1092,4 @@
 {
 	remove_proc_entry("route", proc_net);
 }
-
-#else /* CONFIG_PROC_FS */
-
-int __init fib_proc_init(void)
-{
-	return 0;
-}
-
-void __init fib_proc_exit(void)
-{
-	return 0;
-}
 #endif /* CONFIG_PROC_FS */

diff -Nru a/net/ipv4/udp.c b/net/ipv4/udp.c
@@ -1377,16 +1377,4 @@
 {
 	remove_proc_entry("udp", proc_net);
 }
-
-#else /* CONFIG_PROC_FS */
-
-int __init udp_proc_init(void)
-{
-	return 0;
-}
-
-void __init udp_proc_exit(void)
-{
-	return 0;
-}
 #endif /* CONFIG_PROC_FS */

diff -Nru a/net/socket.c b/net/socket.c
@@ -66,6 +66,7 @@
 #include <linux/interrupt.h>
 #include <linux/netdevice.h>
 #include <linux/proc_fs.h>
+#include <linux/seq_file.h>
 #include <linux/wanrouter.h>
 #include <linux/netlink.h>
 #include <linux/rtnetlink.h>

===================================================================

This BitKeeper patch contains the following changesets:
1.827
## Wrapped with gzip_uu ##

begin 664 bkpatch3671 M'XL(`'&YTST``^U:ZW/:2!+_C/Z*V:3.!83'C-ZRU[D\[&1=FTU2R>:NZFZO M5$(:&14@L9(@R1WYWZ][1HD!!B7Z^Z+=PE(TST]_?A-=X^LI^1+QM/SEN?/ MN/*4_))D^7G+3V+NY]'2&_C);#!*@?I28P'"<S/GSUZS#F>5\=&I0/GJY M/R9+GF;G+3;0-B/Y]SD_;WVZ?OOEW<M/BG)Y25Z/O?B6?^8YN;Q4\B1=>M,@ M>^'EXVD2#_+4B[,9S\6:JPWK2J54A?\-9FG4,%?,I+JU\EGF*<S'E!5MTU= M0?5?U-6N26&,:?"QF;%2;9TZRA5AUNU"%6'CV93IAZKMOGAMFGZCFEI%$H M>6:3/E5>D8<UX+7BDX1$\Z5^3F!)<&=.AO,T\='5P]3["NN1C/_IAM&4R]\
M7DZSY%Q>#@BPY@FZ/"-ADA(7I[I1'.4D7,2@?Q)G)(FGWTG,><#$L7$"X&! MYP._1[PX$%0014@4DM<?WK^Y>>M^_/3AM?OF,XDR6#H?B(50G2SQ)SA1",M MEC]=!)S\/(WBQ;?A6LO!^+F8D?)EQ+\2L*&8(9874S+E5Z+:#M.4CUMT*/T3 M_U,4ZE'E^9&(E!4O!\4QK)6I6Y:Q\FEHJ:87&H85CE3';P;`KB``ELYTW3;H MBC*'6D=5*:P7H5T$\\&XHH]NKTS**'P'OF,X(\Y]3BVF[5&G65A))Q,NU9-T MBN80P-&N6M1T=&-EF79H!Z%M:JH>C)P]^V2_P))JFJ$Q\TZ1PYTQ!!GNV,O& M]0#:*]UP8&^-0D<-+:[:7/.981@'M@DKZ08LQQ#O[//).X;(@D6.B:U5H9& MF:?!N.79CL.L(RZKRRL#3%79W;N+$09.\[25-!GQ:GCAY:IVQJHY(?.,6=M M19744:EE',?[1H;(3OJ:*IF0T9DFL5UJGH:-SS'/J;.5E093Q;LG+NKL\F M=954PV8:)T%IF$ZZDC3?>H?5:DJKAPTT,L4);APL>+X;UAMJ<L[H49?G1F M0>JAMN9HHD#J.^61'BZ/E/2UQ_+X<.41]_L'TD^_B@]4NX]-*+I'T;PR*=$J MJ"RGZKO#\O2*H03>DL]>Q(L\&\11//$&(.-P:JM@&-?05["B#R<;M$9?_ M5US*TKT'F.40W@>9JN4T0//$='E:=W4D5]:Z*Y#&3&9W3)U9NOW1J3ZB,@' M0Z3L<P\@\MZ)$M"H"C3NEOKC<+QOMZ%,%O\&]A>S3!U$<3KP_$&ZV-]L4!MJ MMJY!$V#H<1!0&HGUVX&D#0?(?EP21+[OAHB=R-X'T@R9FI$5V[@UR2VPK_E M/(UAZ9P0/-5L7-1>)E'0N5@SX-V6@7_;812('7/HLS?*T4P@<V'E]DP[%LF M]^?N+<]!0)BT_;&7DNYH$88\[1%YU\UR+\U[)`E#-\=OB%1/S)WR^#8?U^3! M_CZLT8:AK!&XTE()0U>*WQ9@I%TUKM-!+H=)+O';JEH'<BKY87NR/"%!G'J\
M;6ZC]IYNJ<94E3HJ)!P+RN"]:Q9[+%H/ER'D@X9]*6(;PGOE".H8$-8J,J4B M=P?E"4?V(Q6K?&*G%F7,INK*<'1+5BM5.[E:&0;I&_8C&A^R7E&V%XUBUGV MJ&N8.>%;4YYN%/2RV=#+DUGDHW+5\='WG"=IP--=DK](4Q[G2+C2+2'7@N[L M:=WP/AX6)U>4*;>2,[&KN[&H""CSN-%B6Q1&&[X8%YE$\!=\W+@'C49)) M$;%X=L"VV\,I^(!R1S%;IHL<MXD:"\!2B<.WYA5[3%4099+$FM8[#:<-XF+ M:J,RY%*,OK-"%L\*F@4MR([..?#9:-GQ%8(LT:GE:!:IX%$(.42#U<F^!'" M@C^VHV1YNO!SN>G6/4=.+LE_E-8@]F:<7+9:3SZ]_/N3'@SXTR3#$>03UV(P MB3&UP#V",4=$@)H@BJT[0"2H\3/IX4P<2T&<9_#DF(0KG$,-BQ"(IGG!?=V M,FW=?)MA9SQ.)AEMYNIX@X)*?>76T)QAX11!#FDT&OQ9CG3Z;)K9OZR_4$ M?^EFDQ$2L<:L)RQU47)P>!$7A&)<WO>4'Q?*'Q"C$'98+3VMHR&LAWBYT,'E M'&.!'=IH@;GJHI@/LR'G$6G4GQVR.TY;\-UA[3;S8*ZG3.@]Y\7S!V0@X3( M)P4_^HUT"R<"GM(L7XM:XQT<0D%=*K,R28FO=?WKV[V!"JBW>)U.&R464T MJ87IOBVX^L^EL<!-+TAUZ&<"</R;[O[R^\M7[Z[=SS?_N+X@SYY5F#KHLY;0 M:1V4W!M-^3\K7/\"75M?QVA4&WC/SD@VZ3\/O5D$U>6G2_+QC7OS_OKW#G!) M64B.H27&>=CG9A-!&Z7<F\#8#^AK>;Z?CF#VQ]'O(N"&IW;(S7/EKU]LE.# M9.N+K?YY^MWU;KTH/@>UR1U\(&2AS3])KIK#FZ)R0A!N,?ML=#K9E5'P;8\G MI_+P,T^R/9"M87WMM6UT"]^!#2[79DD0R@B-NETT%VXP0F^GV8<;&QJ?_ M55#)>=TD<;CJK@,H#FV'K>FNS0'<!2Z6T?99X6&\Z6R7[<IU*WY"04(":-*6 M:W?884.X%0R+G<5J_EYXU)(GI?;13ME>-2#T.+3C-<9M@Y?(LNS9]V*EYL< MN_5K,C]LQM:EB[C)J27)+A0GJ*W<=8NS-BHG5L)Y5>OGZ_-X/IO#5V>P",X M$YL6]AC0!F!_UVK1'J'OX%]/3'0C=Q$%[6S>*0]%<2*&<)8NSM'2<"GZF6* MID[^%,KB>ALOC).OQ[P0K#3NC)M'5L\TS;@9U_X9,J)\U"&Y<E?X(!K97_$ MT"^``$<8"$=^5<939H3FVG0XDUV9#K@)3+.HAM(.K@S[#[K_2DPI&O_5RL% MRK8HM)D49+.R4RE2&#C2(K&X+!93T*@0C+GJ2</)6O%DWE6-%!B+Y=,D@]D ML+,"'),2>]%LP(@)94)R5R,0]@JXW!?-!(-00:=XG603'0"';%SZ:PR*CC M=X%YN7O64Y'0(V<E>SI-.1C9FNP/MPY`<:V2WG@O>R\OP'$<PVL<FP(^^&0] M*FXDZY1[V'46S.*NAQ&!TX4#2J'EKCP@-CQ4*V4C00FBU(4#4/H=DM6%[*M2 M7[09F*/F<.6#0CDOGDXA9_L)R'W2(Y_=FT]?WG[H24'05&,*PFTQQYTPQ[8* MVW-I_5G9&]ML)M;J7[__\-OU;]N\E?K2OV)GU6W9/FV3L9HERR;M2DK]4)Y" MFPN:#;OU\V]W6'V>(5Y+..%YQ@EO1!QYGE%^(0(D@2RFKC1J.?+-LH87RQZ? MK?UO_W0N7D[9]S1#A.]>C]4TFY8?JVUTOA,(3WL%;<]?)9M>09/O-C(0Y*S_ M_F.<_$3M\=7&!WVXBY%HP-]ZD7N@#YJ9AN=59;TV+^#Z8^Y/LL7LTK3-D6=[ +NO)?6)Z$4NTK````
`
end

From: Arnaldo Carvalho de Melo <[email protected]>
Date: Thu, 14 Nov 2002 13:07:23 -0200

Please pull from:

master.kernel.org:/home/acme/BK/net-2.5

Now there are three outstanding changesets there.

All pulled, thanks a lot.