Appletalk: use seq_file for proc stuff

David,

Please consider pulling from:

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

This is the only outstanding changeset there.

Tomorrow I'll do the missing bit: the aarp proc stuff will
be moved to atalk_proc.c too.

And will also fix the .permission bogosity in IPX and LLC.

- 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-10-07 03:27:57-03:00, [email protected]
o Appletalk: use seq_file for proc stuff

And also move MODULE_LICENSE from aarp.c to ddp.c, as its there that the module_init/exit is.

Also added MODULE_AUTHOR and MODULE_DESCRIPTION.

 include/linux/atalk.h            |   14 +
 net/appletalk/Makefile           |    2 
 net/appletalk/aarp.c             |   22 --
 net/appletalk/atalk_proc.c       |  319 +++++++++++++++++++++++++++++++++++++++
 net/appletalk/ddp.c              |  244 +++++------------------------
 net/appletalk/sysctl_net_atalk.c |    7 
 6 files changed, 385 insertions(+), 223 deletions(-)

diff -Nru a/include/linux/atalk.h b/include/linux/atalk.h
@@ -198,5 +198,19 @@
 
 #define at_sk(__sk) ((struct atalk_sock *)(__sk)->protinfo)
 
+extern struct sock *atalk_sockets;
+extern spinlock_t atalk_sockets_lock;
+
+extern struct atalk_route *atalk_routes;
+extern rwlock_t atalk_routes_lock;
+
+extern struct atalk_iface *atalk_interfaces;
+extern spinlock_t atalk_interfaces_lock;
+
+extern struct atalk_route atrtr_default;
+
+extern int atalk_proc_init(void);
+extern void atalk_proc_exit(void);
+
 #endif /* __KERNEL__ */
 #endif /* __LINUX_ATALK_H__ */

diff -Nru a/net/appletalk/Makefile b/net/appletalk/Makefile
@@ -6,7 +6,7 @@
 
 obj-$(CONFIG_ATALK) += appletalk.o
 
-appletalk-y			:= aarp.o ddp.o
+appletalk-y			:= aarp.o ddp.o atalk_proc.o
 appletalk-$(CONFIG_SYSCTL)	+= sysctl_net_atalk.o
 appletalk-objs			:= $(appletalk-y)
 

diff -Nru a/net/appletalk/aarp.c b/net/appletalk/aarp.c
@@ -30,34 +30,13 @@
  */
 
 #include <linux/config.h>
-#include <asm/uaccess.h>
-#include <asm/system.h>
-#include <asm/bitops.h>
-#include <linux/types.h>
-#include <linux/kernel.h>
-#include <linux/sched.h>
-#include <linux/string.h>
-#include <linux/mm.h>
-#include <linux/socket.h>
-#include <linux/sockios.h>
-#include <linux/in.h>
-#include <linux/errno.h>
-#include <linux/interrupt.h>
-#include <linux/if_ether.h>
-#include <linux/inet.h>
-#include <linux/notifier.h>
-#include <linux/netdevice.h>
-#include <linux/etherdevice.h>
 #include <linux/if_arp.h>
-#include <linux/skbuff.h>
-#include <linux/spinlock.h>
 #include <net/sock.h>
 #include <net/datalink.h>
 #include <net/psnap.h>
 #include <linux/atalk.h>
 #include <linux/init.h>
 #include <linux/proc_fs.h>
-#include <linux/module.h>
 
 int sysctl_aarp_expiry_time = AARP_EXPIRY_TIME;
 int sysctl_aarp_tick_time = AARP_TICK_TIME;

@@ -995,4 +974,3 @@
 	proc_net_remove("aarp");
 }
 #endif
-MODULE_LICENSE("GPL");

diff -Nru a/net/appletalk/sysctl_net_atalk.c b/net/appletalk/sysctl_net_atalk.c
@@ -7,7 +7,6 @@
  */
 
 #include <linux/config.h>
-#include <linux/mm.h>
 #include <linux/sysctl.h>
 
 extern int sysctl_aarp_expiry_time;

@@ -16,7 +15,7 @@
 extern int sysctl_aarp_resolve_time;
 
 #ifdef CONFIG_SYSCTL
-static ctl_table atalk_table[] = {
+static struct ctl_table atalk_table[] = {
 	{
 		.ctl_name	= NET_ATALK_AARP_EXPIRY_TIME,
 		.procname	= "aarp-expiry-time",

@@ -52,7 +51,7 @@
 	{ 0 },
 };
 
-static ctl_table atalk_dir_table[] = {
+static struct ctl_table atalk_dir_table[] = {
 	{
 		.ctl_name	= NET_ATALK,
 		.procname	= "appletalk",

@@ -62,7 +61,7 @@
 	{ 0 },
 };
 
-static ctl_table atalk_root_table[] = {
+static struct ctl_table atalk_root_table[] = {
 	{
 		.ctl_name	= CTL_NET,
 		.procname	= "net",

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

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

begin 664 bkpatch18241 M'XL(`(8IH3T``^U;;7.;2!+^+'[%G%.;DKV6Q#N2O/$EL9RL*HZ=\LM=JBY7 M%(*111D)+2"_U"G__;IG`($$"-G)W9=XLQY@IGN>Z>YYIF'&K\A-2(-^P[*G M5'A%_O3#J-^P_1FU(_?>:MO^M#T*H.+2]Z&B,_&GM(-M.^\_=3S/;LEM38#J M+U9D3\@]#<)^0VHKZ9/H:4[[C<O3CS=G[RX%X<T;<C*Q9K?TBD;DS1LA\H-[ MRW/"MU8T\?Q9.PJL63BE$>MXF39=RJ(HPW^:9"BBIB\E752-I2TYDF2I$G5$ M6>WJJH"XWJYC7],BB:(N*J*JB4O5Z"H]84"DMJ[(1)0[DM@1#2(J?=GH:T8+ M+D21%"HEO^ND)0KOR8\=P(E@$Y^\F\\]T.#=]<DBI"2D?YECUZ-D[=D'O@V M":/%>Q-X=^[F4,L+_3)U+^GY//%X.;LU#P;GIR>7YV2<>!/B64%\[8-0(GC MP,4AL4+B1B&))C2@H"&:6!'>@9GX5'3G;E1ASZZ$7'#=MP)=FY#G62'M[= M7/]Y<4FL6?ID<'IU<CG\<CV\.&\+GX@N&K(H?%EY6VCM^",(HB4*Q\7V7\YH MU+$2.W4L_&VB;=IVXF5#U"51T99BMZ<J2\/NCL9=IT>-+M7TD?1"M?I2TWL] MA%<='E]X5-H1YX)#TVF.M8:QT5/,Y:*I"K2<BQI/6NDV88DC:@DJ[7EBCG MD&5#4Y:*HJK='2&SF-E"=-'6MJ&.N[2'AV/%45QE'HF7>G+%.[74G9$1@/ MZW5D<D\#E]OR2.GU=,NP-7NDR=UZSEXIS$"3%$TU=H3VV;JC.&$WP'4-25XZ MBC(:R=+(EJ+4:.UP.549N#)DB)N=ZD[L[V%0SN>.UL\\JAN3W+H5'$IJP80 MD^UH8Z,WHHIH29;8*P%7KC7;HHN,\HOGU6X!IS3!X)CZU>T$_Y!5*&$WU]* M!6P%$'/\+XE]1:OF?_%G\+]-WKO1)TKG-&F(87K;:?"3I\(CA&(MZ+-)=DP MP5<B/G9EZ1DD_3.=(NWJ%$7J_9QE^0.1P+2<\R](*WA@_V#\E8;>W9I#D<8 MA,Z!0Y((S=36O':OYC/_2!BR4":*$!K)G#BSY\"]W82->U]\BZ8@0E\<F*A M+2:P_D."0#V?_%%HO6.NI'$]<4/LZC:PII"0!)!(0?QQ]&#%=C\N0OB&W- M2$=-XP"=[2(*.03FIT!(D$>[X"1Z@JL7,@4#&W"*BP30D_IC=?#R_(1_I MC:61[XL1IYKDS/7IC/(=2WF>.3<*YQN@)FZ.B#XCA*L9/OB@V(I<?W;( M,DZX('(;VG6$;\*KF)O('YR<8)AC][8].=ZHP42GZ#F:V1R'155)*I:OPP@( M??NN2"+FQF.&;.S0,3FY./\P_&A^N;PX,3]<"6$$([&)"7D72%#3A.PN6-A@ M4.9\=VS9E!SPFUM8V]T9V!(?FJ[SV/3\\=B,R-P/]X7_"(TB4?<(^FY@N#1= M\B:I2[2$1RA,7K\F[A'!>K=U/*./T;[0:+1:4,6DQHM@ADT$;[#;0SYWG>= M!!D:9H4,&@11,P:3IJ\'<'5(8L0'">3XWH.N#Y+NPKD[,SVPJ#F:-%^O(V8U M^T<I*H_\G939I]7R]DF?-#G6?:GF-")?BYT/WF0,IM__OO?&0-=PQ(8,E; MX=DG(-ENY_?G)T=X36T61\Q.J-1Z#RHN/4AM?<7$5Q_%UBK^R->QJX\$J"V M7^7$8A_Z\VH3\%&CJQ:SK<[*=F5Q3U._(<Z/1;9&0MFZS(3H\+Y(@J;3-_> M,.FU0<@[QPEH&!)"SFGTX=W>+F')B?L9^\*<"_";[.]_0U[LQX1K<ZZR6 M(8WC?GYK27I(?A/5K_W?1/DK89<M_67#J@\%%@W3$GKV*'WX#-K2@_)+/(G M83-^;G&([1#3^_V\3*;.=]8%H7G8G@5@RR",,K*%C3PK;I.H#MG]]<"2,QY MLXRX`A\7A@QQL0=;22L6"U:D%:1QS^I6A!4<$:P+*@@KJ)SO'-%+R2J@EK-. M5AQI-5&M[+$327&Q%Q-4SLY;"2HH)"@^2D9.&T[:(*8@GB(9EZW%58&S-GU5 MBY282S9(*>^44D**>WH&&24VC79AHFLK@&@@\<\EJ@@(^>!9MR$9T/MRUD$O M!%%@0DYA+;RH#=P1.RL"$[_.51XE_6:Y:<#K6+]9AFJI#OP.8W**23!FC"!J M'=]:$7VPGA(R(FO/D(0R<E@[QM'PABG#[2<C87"+R7,%JA)B#EW$[)D#MWH4 M8WO&<*I'LA,_8JJ8)4:\Q\2EE!FY0+BBQ#"=;5QVQ8EPA95A!2>&E?02@_D9 M&5R,M9H5,\;8B19CN1?P(K?RBS*V>(1KZ5KBHQ^=JZ6N>D&BMN:34E),^MJ) M%=.XS=-D$O_;63)+!M=/<TK.?-OR3,QX@"KIU>B9C?7C^9?"[J@/&UK[%TF M]U<1N1D.RD@TC!U@1<Q99GC7Q&SG6R$7,1I*22B3SN7ONWC9_<J1<+%LH@<S M$[=$DC3-B()SNFGO2.)7+)';[NYUC+8NP31ADI?IN*L=N,G!7Y4]<V<5UL MO@8(#U,Z-2T/O,[D\Y5!IC(%C5$!RJ\N3CZ9P_.+P6D3'[*HV&\=N^;"=4IY M,T7?P[O_/C>'A:^/AS=AXO\WHAZQFT.;;)2!KXX0A9:VP\I"I\N>EC;"2 M-8*X+F\$E8?"]Z,:8^&Y0^4X,DEGR1A6&5X)_E4N5()]E<+4Q!U/[TK@V96A M!'F&A$N@9SBK!'N&:5+PE:^-,*!9PDDN3@$@<3X3XH><I/!WG!SR99#;8M;$ MBD/RNB0@MV>*/[S_-(AJ$/(/[WP5"?G>,^JV3>/Q*HRPCT:C>%IA'<8\@ZV M84.':WSF>2&E=\E3=L.;>M0*:=J8W>6C9"M.;MU*C"N__A_PQ0ZH!)AQ_D]# MR+Z".FY@TED4/"6I5O(4VV-FFR[F&0J\9ZMY=E,8%W9'+,>$]L&&/K]/SB M\^EGMN[F>X%*=CF]@YOF'JO<.^3/<.V+$[2_Y:7V<RL]*)V#'AL,TYE;1B( MYEX:BJ#RRAQ>WGR\."1KJI(>YEFEJR"&ZGGKF'\PY@XKY!&LJT+"FYG%$RJ M$L$JUJMZY]&T<_=<K++_3"SS-Q!TM[C^VF^S!W%C]AS/,A0::-8:H=BN:R+ M"V73!L7R11&W"BVD1Y:UFB8[+Y'I>]7LV!79#N9H*AQZM):K0M&B4-[18$V M2.=@;<<"MUGJ3/U\%EC'3M^ARYD#H5;8)VXD%^X[;S]']/S][Y+=S0J%75$5 M%5%4]:6N26J7[6.J&X>+E.I]3$G]=;JHZG01/UJPMA%;Z)3G[,&"-8FD"I#% M4LR5-K_:I&_T21-XMV8OUME7W.2U&IDOKZK@WGRU31N&#SDU&6^7)9IR^T3 M9C>(RB"N;=%4HUS[F)@V7>6D:P20]IOY9K$VX5'-YN&0Y*#+]DG]DC,WPIWE MOHWF4CM83(+68N:V1KX]64S;#JW4J\FJ#+&G:GBK*\^<W*0E_9K;I7.;'VFJ M/&21..49DWO0(Y(PQ%^INM93H]'HO^'#Y6/U,R';]HO.,''3[!BDNYQ9JW>N M)J.P*QJB(LE:;ZFKLL3/M?9VC4V1M&3Y5W"6!B<_#EA]H@!>TYH*@J1(&'0 M9"(+QW6((C67A>*S?AC8]XU_'8XRUDK^C+Z,L$G=WLZ/[VU,S.J7:!&D/X5 M?V7QQT_*5L8?@_.<M$?%N",'C49Z<*R='!EK]!N?T1K,^'L\?3#IDD_F1M M"\$,,0UQK&L$&,G0,+(-9-]!5V:_-0*KJ"1AQ5"2="BJ\JW*1O>+:^^#,_- M,_Q&?7..Q>G@2!A8D]@T@X44<)>%%%>]5*1BI7G8-#1Y3\WNH&)Q-5KZ^I+ M<[-M25G9B&"!Q%6,%]O3M8$B&:P]*PH/T!PDIU@V#O"@N"PR<5;4/)P%9,:% ME)50C6-"T7M$17$@35V@?!TG,LCU'Q(:GU1[CA%G^_J8U,U7OH7]40H:B+ MC!^[BVV[>?2.@R!)@\PX<!=LH'99Q*I=C-@&>QTO.QX&;]MF$4.3$\(X1BZ M.CJ%%_6'#O2*.#2I^S\;NJ8@/[email protected]:=N=;1G)(C1FMGBQ@BX"I$ MQ(I:1TP&NH(PAKJ"S-!X"-R(UH(3;>*)\']$%&4@Z2H+25UC(5G7,2_TC*XS MS_"B4=\UNM%E8(T>YL,I.#@4/:>#1FE>XQ.>!&;<JOY6?(TY$7A49V#8#5C MDOX'AL@&R(LZ7AL8$@L-7M0$9\A<AA4[@).[7*Q;&YS"YCPO:H*31%B*#0TN M>CT5^1A*MG:LO^QC8\C!5.PA+AMLW_RN^>GT\MP<GG^X('OGI]=JG^=?UR!/ MQ#8L)1B%9_BIAF!U6^2;]*!--BG&UR;ZU']NTVD"=*@&J;T(^,6ON??QR MADIRV51S[YUGS<B)_TC^P*LV7+UEWXC:?G![G&F?R;5J[:S<1\\Z^P=LW2 MG_M'8K52]C+EAF2]T1-72J*K&@L?U=V3=\5TE)_Y>X5'RWQS^\J<_=-]SSG M/5)BKXX2^]+!?N=W]K"'R!IY-*8;=OVO?[/=1EAV2*G;97"W;R<I,XD]>V2 @@>]'.='TCX7M";7OPL7TC3$:XV=T3?@O_'+2#)X\````
`
end

From: Arnaldo Carvalho de Melo <[email protected]>
Date: Mon, 7 Oct 2002 03:44:41 -0300

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

Pulled, thanks.