Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/net Fixup of bad patch made by me; the #ifdef ought to b...



details:   https://anonhg.NetBSD.org/src/rev/937890be2e9e
branches:  trunk
changeset: 572349:937890be2e9e
user:      reinoud <reinoud%NetBSD.org@localhost>
date:      Thu Dec 30 15:38:50 2004 +0000

description:
Fixup of bad patch made by me; the #ifdef ought to be also including ISO
rather than being removed. Also fixed a small comment about the scope of
#if's.

This code is a but ugly IMHO but as long as we dont have to change it ....

diffstat:

 sys/net/if_tokensubr.c |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (37 lines):

diff -r 8a577687cc7e -r 937890be2e9e sys/net/if_tokensubr.c
--- a/sys/net/if_tokensubr.c    Thu Dec 30 13:12:01 2004 +0000
+++ b/sys/net/if_tokensubr.c    Thu Dec 30 15:38:50 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_tokensubr.c,v 1.28 2004/12/29 17:57:19 reinoud Exp $        */
+/*     $NetBSD: if_tokensubr.c,v 1.29 2004/12/30 15:38:50 reinoud Exp $        */
 
 /*
  * Copyright (c) 1982, 1989, 1993
@@ -99,7 +99,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tokensubr.c,v 1.28 2004/12/29 17:57:19 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tokensubr.c,v 1.29 2004/12/30 15:38:50 reinoud Exp $");
 
 #include "opt_inet.h"
 #include "opt_atalk.h"
@@ -634,7 +634,7 @@
                }
                break;
        }
-#endif /* INET || NS */
+#endif /* INET || NS || DECNET */
 #ifdef ISO
        case LLC_ISO_LSAP:
                switch (l->llc_control) {
@@ -732,7 +732,9 @@
        default:
                /* printf("token_input: unknown dsap 0x%x\n", l->llc_dsap); */
                ifp->if_noproto++;
+#if defined(INET) || defined(NS) || defined(DECNET) || defined(ISO)
        dropanyway:
+#endif
                m_freem(m);
                return;
        }



Home | Main Index | Thread Index | Old Index