[PATCH] Fix IPv6 [was Re: Linux v2.5.41]

Jasper Spaans
2002-10-07T20:58:10Z

On Mon, Oct 07, 2002 at 12:02:59PM -0700, Linus Torvalds wrote:

> o [IPV4/IPV6]: General cleanups

Some part of this makes my tree noncompilable:

net/ipv6/addrconf.c: In function `ipv6_addr_type':
net/ipv6/addrconf.c:155: case label does not reduce to an integer constant
net/ipv6/addrconf.c:159: case label does not reduce to an integer constant
etc.

Please apply this (undo-) patch...

(using gcc 2.95.4 this does compile)

Regards,

Jasper

--- linux-2.5.40/net/ipv6/addrconf.c~ 2002-10-07 22:26:37.000000000 +0200
+++ linux-2.5.40/net/ipv6/addrconf.c 2002-10-07 22:27:43.000000000 +0200
@@ -151,16 +151,16 @@
if ((st & htonl(0xFF000000)) == htonl(0xFF000000)) {
int type = IPV6_ADDR_MULTICAST;

- switch((st & htonl(0x00FF0000))) {
- case htonl(0x00010000):
+ switch((st & __constant_htonl(0x00FF0000))) {
+ case __constant_htonl(0x00010000):
type |= IPV6_ADDR_LOOPBACK;
break;

- case htonl(0x00020000):
+ case __constant_htonl(0x00020000):
type |= IPV6_ADDR_LINKLOCAL;
break;

- case htonl(0x00050000):
+ case __constant_htonl(0x00050000):
type |= IPV6_ADDR_SITELOCAL;
break;
};

--
Jasper Spaans
http://jsp.ds9a.nl/contact/
Tel/Fax: +31-84-8749842
``Got no clue? Too bad for you.''