On Fri, Mar 15, 2013 at 03:30:00PM +0100, Martin Pieuchot wrote:
tatus: O
Content-Length: 119872
Lines: 4249
ueagle(4) is the only driver requiring netnatm and none of them are
enabled in GENERIC. All commits touching this code are just fixups
for fallouts of other changes.
Would anyone mourn their deportation to the Attic?
In other words, ok to tedu them? Diff below.
Martin
The only reason it is disabled in GENERIC is that the config
logic needs to be fixed, here is a diff to do that:
Index: conf/files
===
RCS file: /cvs/src/sys/conf/files,v
retrieving revision 1.538
diff -u -p -r1.538 files
--- conf/files 23 Aug 2012 06:12:49 - 1.538
+++ conf/files 18 Oct 2012 00:13:48 -
@@ -743,6 +743,9 @@ file net/bpf.c bpfilter
needs-count
file net/bpf_filter.c bpfilter
file net/if.c
file net/if_atmsubr.c atm needs-flag
+file netnatm/natm_pcb.catm
+file netnatm/natm_proto.c atm
+file netnatm/natm.catm
file net/if_ethersubr.cether | inet | fddi
needs-flag
file net/if_fddisubr.c fddi
file net/if_spppsubr.c sppp
@@ -869,9 +872,6 @@ file netmpls/mpls_output.c mpls
file netmpls/mpls_proto.c mpls
file netmpls/mpls_raw.cmpls
file netmpls/mpls_shim.c mpls
-file netnatm/natm_pcb.cnatm
-file netnatm/natm_proto.c natm
-file netnatm/natm.cnatm
file nfs/krpc_subr.c nfsclient
#file nfs/nfs_aiod.c nfsclient
file nfs/nfs_bio.c nfsclient
Index: net/if.c
===
RCS file: /cvs/src/sys/net/if.c,v
retrieving revision 1.245
diff -u -p -r1.245 if.c
--- net/if.c5 Oct 2012 17:17:04 - 1.245
+++ net/if.c17 Oct 2012 23:49:59 -
@@ -61,6 +61,7 @@
* @(#)if.c8.3 (Berkeley) 1/4/94
*/
+#include atm.h
#include bluetooth.h
#include bpfilter.h
#include bridge.h
@@ -585,7 +586,7 @@ do { \
#ifdef INET6
IF_DETACH_QUEUES(ip6intrq);
#endif
-#ifdef NATM
+#if NATM 0
IF_DETACH_QUEUES(natmintrq);
#endif
#undef IF_DETACH_QUEUES
Index: net/if_atmsubr.c
===
RCS file: /cvs/src/sys/net/if_atmsubr.c,v
retrieving revision 1.32
diff -u -p -r1.32 if_atmsubr.c
--- net/if_atmsubr.c24 Aug 2010 14:43:56 - 1.32
+++ net/if_atmsubr.c17 Oct 2012 23:49:24 -
@@ -102,7 +102,8 @@
#if defined(INET) || defined(INET6)
#include netinet/in_var.h
#endif
-#ifdef NATM
+#include atm.h
+#if NATM 0
#include netnatm/natm.h
#endif
@@ -289,7 +290,7 @@ atm_input(ifp, ah, m, rxhand)
ifp-if_ibytes += m-m_pkthdr.len;
if (rxhand) {
-#ifdef NATM
+#if NATM 0
struct natmpcb *npcb = rxhand;
s = splnet(); /* in case 2 atm cards @ diff lvls */
npcb-npcb_inq++; /* count # in queue */
Index: net/netisr.c
===
RCS file: /cvs/src/sys/net/netisr.c,v
retrieving revision 1.2
diff -u -p -r1.2 netisr.c
--- net/netisr.c9 Jul 2011 00:47:18 - 1.2
+++ net/netisr.c17 Oct 2012 23:47:49 -
@@ -20,6 +20,7 @@
#include machine/intr.h
+#include atm.h
#include bluetooth.h
#include ether.h
#include ppp.h
Index: netinet/if_atm.c
===
RCS file: /cvs/src/sys/netinet/if_atm.c,v
retrieving revision 1.17
diff -u -p -r1.17 if_atm.c
--- netinet/if_atm.c5 Jul 2011 21:40:38 - 1.17
+++ netinet/if_atm.c17 Oct 2012 23:51:00 -
@@ -61,7 +61,8 @@
#include netinet/ip.h
#include netinet/if_atm.h
-#ifdef NATM
+#include atm.h
+#if NATM 0
#include netnatm/natm.h
#endif
@@ -81,7 +82,7 @@ atm_rtrequest(int req, struct rtentry *r
struct sockaddr *gate = rt-rt_gateway;
struct atm_pseudoioctl api;
struct rt_addrinfo rtinfo;
-#ifdef NATM
+#if NATM 0
struct sockaddr_in *sin;
struct natmpcb *npcb = NULL;
struct atm_pseudohdr *aph;
@@ -128,7 +129,7 @@ atm_rtrequest(int req, struct rtentry *r
if (rt-rt_ifp-if_ioctl == NULL) panic(atm null ioctl);
#endif
-#ifdef NATM
+#if NATM 0
/*
* let native ATM know we are using this VCI/VPI
* (i.e. reserve it)
@@ -164,7 +165,7 @@ atm_rtrequest(int req, struct rtentry *r
break;
failed:
-#ifdef NATM
+#if NATM 0
if (npcb) {
npcb_free(npcb, NPCB_DESTROY);
rt-rt_llinfo = NULL;
@@ -181,7 +182,7 @@ failed:
case RTM_DELETE:
-#ifdef NATM
