Subject: re: CVS commit: src/sys/net
To: Reinoud Zandijk <reinoud@netbsd.org>
From: matthew green <mrg@eterna.com.au>
List: source-changes
Date: 12/31/2004 01:43:26
--fdj2RfSjLxBAspz7
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Hiya Matthew,
On Thu, Dec 30, 2004 at 11:38:57PM +1100, matthew green wrote:
> this change seems broken to me. the #if you removed encompasses
> exactly how the label is used, and as you say, it now will fail
> without options INET. what is the purpose of this change? i
> think it should be reverted.
The change is :
@@ -732,9 +732,7 @@
default:
/* printf("token_input: unknown dsap 0x%x\n", l->llc_dsap); */
ifp->if_noproto++;
-#if defined(INET) || defined(NS) || defined(DECNET)
dropanyway:
-#endif
m_freem(m);
return;
}
-----
In the same function (on line 790) there is the `catch-all' line that jumps
to that label; if INET is not defined the label won't be defined without
the patch!
default:
/*
printf("token_input: unknown protocol 0x%x\n", etype);
*/
ifp->if_noproto++;
goto dropanyway;
}
Hope this helps...
it doesn't. this function ends before line 790. the "goto dropanyway;"'s are:
line 597, 601, 633: within same:
#if defined(INET) || defined(NS) || defined(DECNET)
line 662, 667: within #ifdef ISO
so if anything the test for "dropanyway" should be:
#if defined(INET) || defined(NS) || defined(DECNET) || defined(ISO)
.mrg.