fix hppfs Makefile breakage

[linux-2.6] / include / linux / in.h

diff --git a/include/linux/in.h b/include/linux/in.h
index f8d60737901793422bb6b26331eaa2c1e7e661c3..4065313cd7eee7f3a287d3cd0629ffcb726041f1 100644 (file)
--- a/include/linux/in.h
+++ b/include/linux/in.h
@@ -262,9 +262,10 @@ static inline bool ipv4_is_local_multicast(__be32 addr)
        return (addr & htonl(0xffffff00)) == htonl(0xe0000000);
 }
 
-static inline bool ipv4_is_badclass(__be32 addr)
+static inline bool ipv4_is_lbcast(__be32 addr)
 {
-       return (addr & htonl(0xf0000000)) == htonl(0xf0000000);
+       /* limited broadcast */
+       return addr == htonl(INADDR_BROADCAST);
 }
 
 static inline bool ipv4_is_zeronet(__be32 addr)
@@ -272,12 +273,6 @@ static inline bool ipv4_is_zeronet(__be32 addr)
        return (addr & htonl(0xff000000)) == htonl(0x00000000);
 }
 
-#define LOOPBACK(x)            ipv4_is_loopback(x)
-#define MULTICAST(x)           ipv4_is_multicast(x)
-#define BADCLASS(x)            ipv4_is_badclass(x)
-#define ZERONET(x)             ipv4_is_zeronet(x)
-#define LOCAL_MCAST(x)         ipv4_is_local_multicast(x)
-
 /* Special-Use IPv4 Addresses (RFC3330) */
 
 static inline bool ipv4_is_private_10(__be32 addr)
@@ -316,12 +311,4 @@ static inline bool ipv4_is_test_198(__be32 addr)
 }
 #endif
 
-#define PRIVATE_10(x)          ipv4_is_private_10(x)
-#define LINKLOCAL_169(x)       ipv4_is_linklocal_169(x)
-#define PRIVATE_172(x)         ipv4_is_private_172(x)
-#define TEST_192(x)            ipv4_is_test_192(x)
-#define ANYCAST_6TO4(x)                ipv4_is_anycast_6to4(x)
-#define PRIVATE_192(x)         ipv4_is_private_192(x)
-#define TEST_198(x)            ipv4_is_test_198(x)
-
 #endif /* _LINUX_IN_H */