From 0262dee7f1b42c8f0af2b57e166bc21416a2c37a Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Fri, 22 Oct 2004 10:03:53 +0000 Subject: 2004-10-22 Ralf Corsepius * libnetworking/opt_atalk.h, libnetworking/opt_bdg.h, libnetworking/opt_inet.h, libnetworking/opt_inet6.h, libnetworking/opt_ipx.h, libnetworking/opt_mac.h, libnetworking/opt_netgraph.h: New (Stubs). * libnetworking/net/if_loop.c: Cosmetical update from FreeBSD. --- cpukit/ChangeLog | 8 +++++++ cpukit/libnetworking/net/if_loop.c | 43 ++++++++++++++++--------------------- cpukit/libnetworking/opt_atalk.h | 5 +++++ cpukit/libnetworking/opt_bdg.h | 5 +++++ cpukit/libnetworking/opt_inet.h | 5 +++++ cpukit/libnetworking/opt_inet6.h | 5 +++++ cpukit/libnetworking/opt_ipx.h | 5 +++++ cpukit/libnetworking/opt_mac.h | 5 +++++ cpukit/libnetworking/opt_netgraph.h | 5 +++++ 9 files changed, 61 insertions(+), 25 deletions(-) create mode 100644 cpukit/libnetworking/opt_atalk.h create mode 100644 cpukit/libnetworking/opt_bdg.h create mode 100644 cpukit/libnetworking/opt_inet.h create mode 100644 cpukit/libnetworking/opt_inet6.h create mode 100644 cpukit/libnetworking/opt_ipx.h create mode 100644 cpukit/libnetworking/opt_mac.h create mode 100644 cpukit/libnetworking/opt_netgraph.h diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index e94a50b458..4eee56ac9a 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,11 @@ +2004-10-22 Ralf Corsepius + + * libnetworking/opt_atalk.h, libnetworking/opt_bdg.h, + libnetworking/opt_inet.h, libnetworking/opt_inet6.h, + libnetworking/opt_ipx.h, libnetworking/opt_mac.h, + libnetworking/opt_netgraph.h: New (Stubs). + * libnetworking/net/if_loop.c: Cosmetical update from FreeBSD. + 2004-10-21 Ralf Corsepius * libnetworking/net/ethernet.h: Remove BYTE_PACK. diff --git a/cpukit/libnetworking/net/if_loop.c b/cpukit/libnetworking/net/if_loop.c index 6ff6bdfe4d..d0c63f58cf 100644 --- a/cpukit/libnetworking/net/if_loop.c +++ b/cpukit/libnetworking/net/if_loop.c @@ -10,10 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -30,7 +26,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#)if_loop.c 8.1 (Berkeley) 6/10/93 + * @(#)if_loop.c 8.2 (Berkeley) 1/9/95 + * $FreeBSD: src/sys/net/if_loop.c,v 1.102 2004/08/27 18:33:07 andre Exp $ + */ + +/* * $Id$ */ @@ -40,6 +40,11 @@ #include "loop.h" #if NLOOP > 0 +#include "opt_atalk.h" +#include "opt_inet.h" +#include "opt_inet6.h" +#include "opt_ipx.h" + #include #include #include @@ -67,18 +72,15 @@ #include #endif -#ifdef NS -#include -#include +#ifdef INET6 +#ifndef INET +#include #endif - -#ifdef ISO -#include -#include +#include +#include #endif #ifdef NETATALK -#include #include #include #endif /* NETATALK */ @@ -93,6 +95,8 @@ PSEUDO_SET(loopattach, if_loop); #ifdef TINY_LOMTU #define LOMTU (1024+512) +#elif defined(LARGE_LOMTU) +#define LOMTU 131072 #else #define LOMTU 16384 #endif @@ -147,6 +151,7 @@ looutput(ifp, m, dst, rt) m->m_data += sizeof(int); } + /* Let BPF see incoming packet */ if (ifp->if_bpf) { /* * We need to prepend the address family as @@ -188,18 +193,6 @@ looutput(ifp, m, dst, rt) isr = NETISR_IPX; break; #endif -#ifdef NS - case AF_NS: - ifq = &nsintrq; - isr = NETISR_NS; - break; -#endif -#ifdef ISO - case AF_ISO: - ifq = &clnlintrq; - isr = NETISR_ISO; - break; -#endif #ifdef NETATALK case AF_APPLETALK: ifq = &atintrq2; diff --git a/cpukit/libnetworking/opt_atalk.h b/cpukit/libnetworking/opt_atalk.h new file mode 100644 index 0000000000..2b4c47e48f --- /dev/null +++ b/cpukit/libnetworking/opt_atalk.h @@ -0,0 +1,5 @@ +/* + * $Id$ + */ + +/* intentionally empty file */ diff --git a/cpukit/libnetworking/opt_bdg.h b/cpukit/libnetworking/opt_bdg.h new file mode 100644 index 0000000000..2b4c47e48f --- /dev/null +++ b/cpukit/libnetworking/opt_bdg.h @@ -0,0 +1,5 @@ +/* + * $Id$ + */ + +/* intentionally empty file */ diff --git a/cpukit/libnetworking/opt_inet.h b/cpukit/libnetworking/opt_inet.h new file mode 100644 index 0000000000..2b4c47e48f --- /dev/null +++ b/cpukit/libnetworking/opt_inet.h @@ -0,0 +1,5 @@ +/* + * $Id$ + */ + +/* intentionally empty file */ diff --git a/cpukit/libnetworking/opt_inet6.h b/cpukit/libnetworking/opt_inet6.h new file mode 100644 index 0000000000..2b4c47e48f --- /dev/null +++ b/cpukit/libnetworking/opt_inet6.h @@ -0,0 +1,5 @@ +/* + * $Id$ + */ + +/* intentionally empty file */ diff --git a/cpukit/libnetworking/opt_ipx.h b/cpukit/libnetworking/opt_ipx.h new file mode 100644 index 0000000000..2b4c47e48f --- /dev/null +++ b/cpukit/libnetworking/opt_ipx.h @@ -0,0 +1,5 @@ +/* + * $Id$ + */ + +/* intentionally empty file */ diff --git a/cpukit/libnetworking/opt_mac.h b/cpukit/libnetworking/opt_mac.h new file mode 100644 index 0000000000..2b4c47e48f --- /dev/null +++ b/cpukit/libnetworking/opt_mac.h @@ -0,0 +1,5 @@ +/* + * $Id$ + */ + +/* intentionally empty file */ diff --git a/cpukit/libnetworking/opt_netgraph.h b/cpukit/libnetworking/opt_netgraph.h new file mode 100644 index 0000000000..2b4c47e48f --- /dev/null +++ b/cpukit/libnetworking/opt_netgraph.h @@ -0,0 +1,5 @@ +/* + * $Id$ + */ + +/* intentionally empty file */ -- cgit v1.2.3