ipv4: move /proc/net/arp seq_file support back to arp.c

David,

Please pull from:

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

Now that we have everything settled as how this is to be done, i.e. we
now know how to use seq_file properly and ip_proc was considered harmful, with the conversion happening in the same file it is today, I think I'll be able to finish the rest by the end of this week.

Best regards,

- 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-21 01:18:33-03:00, [email protected]
o ipv4: move /proc/net/arp seq_file support back to arp.c

This also buries ip_proc.c.

 b/include/linux/udp.h |    3 
 b/include/net/arp.h   |    1 
 b/net/ipv4/Makefile   |    2 
 b/net/ipv4/af_inet.c  |   69 +++++++++-
 b/net/ipv4/arp.c      |  287 +++++++++++++++++++++++++++++++++++++++++
 b/net/ipv4/udp.c      |   12 +
 net/ipv4/ip_proc.c    |  344 --------------------------------------------------
 7 files changed, 367 insertions(+), 351 deletions(-)

diff -Nru a/include/linux/udp.h b/include/linux/udp.h
@@ -57,4 +57,7 @@
 
 #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/arp.h b/include/net/arp.h
@@ -18,7 +18,6 @@
 extern int	arp_bind_neighbour(struct dst_entry *dst);
 extern int	arp_mc_map(u32 addr, u8 *haddr, struct net_device *dev, int dir);
 extern void	arp_ifdown(struct net_device *dev);
-extern unsigned arp_state_to_flags(struct neighbour *neigh);
 
 extern struct neigh_ops arp_broken_ops;
 

diff -Nru a/net/ipv4/Makefile b/net/ipv4/Makefile
@@ -4,7 +4,7 @@
 
 obj-y     := utils.o route.o inetpeer.o proc.o protocol.o \
 	     ip_input.o ip_fragment.o ip_forward.o ip_options.o \
-	     ip_output.o ip_sockglue.o ip_proc.o \
+	     ip_output.o ip_sockglue.o \
 	     tcp.o tcp_input.o tcp_output.o tcp_timer.o tcp_ipv4.o tcp_minisocks.o \
 	     tcp_diag.o raw.o udp.o arp.o icmp.o devinet.o af_inet.o igmp.o \
 	     sysctl_net_ipv4.o fib_frontend.o fib_semantics.o fib_hash.o

diff -Nru a/net/ipv4/udp.c b/net/ipv4/udp.c
@@ -1360,8 +1360,20 @@
 		rc = -ENOMEM;
 	return rc;
 }
+
+void __init udp_proc_exit(void)
+{
+	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;
 }

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

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

begin 664 bkpatch17330 M'XL(*2LST``]5;>W/:2!+_6_H4$U*)?/0PD!:]\ZL9VX$C_.6==M59Q2 MR6(P!)!823C)'MG/?MTS(R&!9R;NZNPK)%F>GIZ^M>OT2C/R4U(@Z[DN%,J M/R=O_3#J2J[O43<:/3@-UY\V[@+HN/9]Z&@._2EMOGK7]&A4UQJ&##U73N0. MR0,-PJZD-O2D)?HVHUWI^N3-S?NC:UD^.""OAXYW3S_0B!P<R)$?/#B3?OBK M$PTGOM>(L<+IS1B<RX2TH6F*!K\9ZAM73',A6HJK?;"5?NJZK14VE>TEF6V M9!3_UU6Q5[BHP$8U5:.E+33=4E7YF*@-^"6*UE25I@87:E>UNKI>5_2NHI!< MIF2_3>J*_(K\V`6\EEWBD]'LH=4E4_^!DN8L\%W4<],)9B2D?]B#T822<#Z; M^4%$[AQW#"(0Z&RX,!:^OPU'(7$FH4_NYL&(AL#-1B8-MR&_(YJI=MKRU1($ MN;[E1Y851Y$/-RP<)<9E-)EDZ=5W#&NAF8;:65#=TEMWBN)J+AUT3"-?TWFL M5/RVU+9B+92.H:D;Q1EY[F3>I\W)R)M_;<[[L\8P(U-+6>@=4VDO#%U1'1W:
MVX[5Z:CM`IF*^*4%L_2._G0](8\U/>D:R+.@2L<=M,V6I8-([J"S24]+5FEQ MU+9J/%V<<V=,T=+6D#-4J[6PU+Y!];N.I>K:P&JYFR3*<$L)9:J6UGXR>,(+ M5J&S%BVS8UD+>F=V5*.C:O#'TLTBH?*YI375,BP4:L.:$K<2XU55-0U#UQ>* MT@8'=RW-LG1C8&FZJ=]I1<;]:A2]HW1&@V:?3FA$^\T&7-03YG^M\EE*JQN6 M`3%,Z^CF%NXXL$=PD^.2!H"Y:)MJWS3,CG:GMUS%M3:Z9(9=2HDZ(*NQ<+_U M"C$M_%C=;\N.)P@=[1/LBR4(54OE!Z5K6%U#>SP_*/^M_'#,U-@EZ^)C?&?F M<$GJP1?VA7A]M3T$.R0%A#HG*F[.\3N'9GD\_Q-T\.O4GX6-D1<T'+<1S!\) MS:!3O``/U^".P:IGLWZ[JUB/HZK_E%F?I:(5H\C1TPZPGQD=HLOT:T0##UA& M!!BQB2$NC*+R@S_J5WIQ/]XM">C7)<%MQGZ2T/QTZ]DR-Q1$A*+<H.J*V3+ M$B&\=:S=+?B@?KS60[+A066DVAI![LY!KVI#/2U(F$SZ#M6*9O2P$J5HJJ:
MWFKK[86I0?'%MPG;@J[^E*#SLFP%]34U[8)Z&T_PS\2P0_,ZL^CV3QJX'KL MT'?']Y,YA;O;K&TD=<86QK%EJ;/).M9*G;A(T$T%*FLT#ZV]K7V8L(O4?CX# MX=5=D8$DFMHEGT"$)9K\7,08\@M/3RQA#,+&\'"M*UX-]IV!SQHP'!,1BK*> MB6[E8Q6R/]"<P:])3!V:FE6RK:1%'U)ML/GHT&?#LCKRXO3LS?VU?7E:_OT M[2G\F3@?+'O:03"#?RR.W0"4JT1_@L7_F!@1S4D7&9/'!5ZT]D.PP"-,'*B M'48ZX1RAX&1NXN@6!P\<=0M0]EFZ.:"+?];EIBF(6@0!0=(HP$I/V-DN"@W MH$Y$RR6HE0C2BV#2:4B2]*]#UX!$<J&GE[1<*%<SF)5TUDVHK>0%<++^62 MSC+!KF(.$$*7TJR@M\)'D!;R@@YFS2661[0(X9GZ[XL%?0)JL'HKI*^GHR M7'1E*:#1'"PB<%D#]D!CMG"L\"YHA*Y$](!BO..B"PJXS*-(%"7(XOM<6H0E MIH/K/)K8"@29N,VC1',35'")JT4#K9]<7)Z?G(.>8H7TY._"R#$U0I0+8//F MA+0<1L'<A5;/ARA893]@,+R1Q?4J_F7V+UJ3B%^%*YBLO-9>P9_ZX2R[!11 MN^]$#O.8\2"@,"/](^D#T:7T/;"[N'G_OI>@EA95",?DP?4\IY,0TE%U)31B MU'R"-XL)%,[)ZX-%Y;+*E@Z8U+8I&Y[^P')CR9!Z8+G<0K0A1_-G"EOO(32K M1>KZSU<OL&>TA>4"X[)]J7!L=C"-MQ4H)TE5DHX"#U3BD]<-<DXG/F$'&\4 MY,TN!P2/5R2?69W=JXWCCJ9A/<M_T-U'+IE[X>C>HWU4CHUMU(Y\>S!Q[L/8 MZSPZNA_>^7-(:NRR@E4/$T3P8(DWR-E'WR)EIX7U<[8?^K'>+3;A?4'M!)H MAI30+XNNH]\UHT(6B[QV^_SR^.;]2>7'%TC-*@+F?(5:K7Y(CCZ\/CLC'*MP MY'LRD@A-\-0/E$[H:F4<83O]?D##$%KCRN!N/F#A@=VY-0AR/9[Y/1;"!GY MRA[6!EX0?(>\0COQ3?O;W*P2&2AB"RT[]D$WA.I/)1^\3.3PD:H6\),K7 M]BECQ7*82YX=D#VR5X&)]O=A'&0IZ;LLR9*XWZOO)=4&F[B<Y6RF.2NGE0HY M)!TN1LQ!!0Z2Y)'Z5&5%?8>V2=["A+$U+?*<D+4!D0[UHC)O?UO0K;=8D@ M6JJ6V!AQBTJ!VYRXBJ;JUIAOFAY(ZC8N'43466-0GO&K+D&O-PQQ?358X,8 MD!C9P8.H;9,"+V5!A^ZGI[@J@8*P0_;.$Y8*4BJ,S],Y[DTSV5>RI6[2KCX M!R2=S(!:L)Y#[(7IC1:FE*/CZP?<F')+S#1R=F;M_;;HP]OSX\^O.N1_?T, M"98Y;.B(6R'*AM)$=Y/&TF'8MGAQ\RH3STT8+'@_?T1'^?5#STHF)&E!"= M^\3S(_2>P1PR*_P?A*2$8:[NE,B7430D4^<>*!>Q.(R("E)PC2!U;PO8'Q) M_KJX.;8O+H^NK\R7Y)GDWJ=&R68)2@"YA[UV-VR0(&;[]F2S>-52R'JW$9L ME.8;Z'<KY*4BV+-,_Z?(7_T-Z&=_!WM6LO]8B-CCV2I*MPF0-2#X4%;(KD.* MY!PN04+7"[V5OA@_(6=2=^>>Q,HUNV[8?EEK$ILP,)4$EI,HA%P45/M7"2) M;PBYTJ3DCHF?8Y)+^3$.I_8F*34N=8>:@L;@J:IC2RI<D)B-H?L/LHI-+!GI MDC*7H*(^(A8:3X%4G/"A&-D-WI1@^X#))A&&P\P46R1[3\Z8*PHO%3@HLYU5 MA#.6M)('H35,+M<.E!/9'*/>5+:5X07,7-8\>3$0AXU$,87S'N5\?_=<`G; M>:54M1J)E^IBU[,573V;>2+4Y.@EHS<<3S8*A*X4"\Y@YS%J?U^$WD?<;.EE M_NQQ<TXGB2<'F7PKVXPABOF<U]'D[:N;T].3Z_<G%T17BH,M<H#L,'7P@4&" MQF-)D"6$O!)J60$/H98;T.#C4H9/H$^H$,*(%\Q#^A5(/GZ"Q9<4/.0PS+;5 M.7KU^OCDM"2RWKA&/O<$PPBI5?-3+U5G17:?/HQ<DU^N6?!A1@\=/"M+VB% MIOHA7HM24T2Z\DL@CRT?*TVQ3X/)^E^<@)*XQ@?_^?WW;OPEC4:#H+H:6,7L MNIMA^,82'AH=]Y>'_,J%T:N=5R<_'9]>8[PQ[N0E6U(!=8RA+V(4#LN2;@:
M+Z5%[3#F^?\S\Q(RANU'RD;J1,>2ZS.T,I4A<WM"O1[Y'&]08E3'^_L(G,"P MS";_^)GM*%JXHU-Q*F/*$NHMOK[O$L%[?7Z^-/W+%WUO?W1!$AN)D7#<IH M4#52>C%OQ-]2C5R<7?WSYNBX7"W/=8UI%:BG3O#-'M-O%?'4R18<F).77M15 M,X0]%/S"1HK_OB9AU2)^+P(;[U2C9=2?%X.<2UO@^Y5$AQK'G/F5*>AQ/? M3UOO(X54RK=G6SEW?JG,'/QV%P^$NB'Q0R@4E'6WOMT:FO\2)$>_G=I7-Z_> MDP6_/+D^!YZ*TLU^X\&IQ2%.L#C8U691B1^EL'PQ]+\\(5_D5#&8-7&E\R@4 MZSR[2H(4_[S]%WO5E5V?HC&)]I*<%L"FNP@]CEWPC&[.&9X@FY2,62'&AGE MSTM?4J%%,@VPI(RSKI#F4WY//3M0N,9_^"F:@#"%F#^C;1!*DM]6=8>("B M&JSH)J+23*IP,)4&UC$DW8,--3;$GY'L$'_&.L!4LAW04,L\T4A;%LCE_=W' M\KW4:=7R,"#_F4L5USR>.A,(0^5P]"?U!^5J",'KS>F5_>[D^N+D/8D["NN M:-*'+3P?N]Q^N/@H2(V\3.FU(DIN7LXFYS3L2('#?H'-^T#DG=\L'I,@&7= ME$Y#K3Y(5<B>:7@Y(?-U4V.(2IKQR-9&T$I\HQDL+027&O*^0XR&"+T&.DS M!/P\P^ECYP3\@XY7.ED;'\I./:2#E1.;=<,1!QTY#WE73RV3<AW)^J,@*=CQ MP2,[J!.'8LQ!\<D/!.P/]MGUS9O+&HD/G]C>.Y8:,9TAI#-$!Q]U<_6\3*M+ MA*"X2%]:Y$IA_LB)SA8KSD:2)Y_ML#>=MSC;V>(EZTUG.YF7K.-700RSI?%_ M4*"I6[\JI/V4KQ:RU\J+CG:8DG9Z"T0W-6*"*;4+&PGY\U!;CNXL(P7&4I M8_S?V=&);NI$%5<M8JP;WJ;[email protected][GTP/5[+BF:73D_P!Q%5:50C,` !````
`
end

From: Arnaldo Carvalho de Melo <[email protected]>
Date: Mon, 21 Oct 2002 01:32:26 -0300

Please pull from:

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

Pulled, thanks.