Fix IPTOS_CLASS definition.

(cherry picked from commit 15bac72bac03faeb3b725b1d208c62160f0c3ad7)

diff --git a/ChangeLog b/ChangeLog
index dc80bd35820c034be7ca52683fa389b11f8ebb77..a78f96d61fb448faac86ca4e7b63b430a4d72757 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-08-11  Ulrich Drepper  <drepper@redhat.com>
+
+       [BZ #11903]
+       * sysdeps/generic/netinet/ip.h (IPTOS_CLASS): Fix definition.
+       Patch by Evgeni Bikov <bikovevg@iitp.ru>.
+
 2010-08-21  Mike Frysinger  <vapier@gentoo.org>
 
        * configure.in: Move assembler checks to before sysdep dir checking.

diff --git a/sysdeps/generic/netinet/ip.h b/sysdeps/generic/netinet/ip.h
index a837b98143e55fa45c6e81fbc1b7f1c70fcf48ce..4955fee3ea71ed437a25fe3b749821ca93c84caa 100644 (file)
--- a/sysdeps/generic/netinet/ip.h
+++ b/sysdeps/generic/netinet/ip.h
@@ -1,5 +1,4 @@
-/* Copyright (C) 1991,92,93,95,96,97,98,99,2000,2009 Free Software
-   Foundation, Inc.
+/* Copyright (C) 1991-1993,1995-2000,2009,2010 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -194,7 +193,7 @@ struct ip_timestamp
  */
 
 #define        IPTOS_CLASS_MASK                0xe0
-#define        IPTOS_CLASS(class)              ((tos) & IPTOS_CLASS_MASK)
+#define        IPTOS_CLASS(class)              ((class) & IPTOS_CLASS_MASK)
 #define        IPTOS_CLASS_CS0                 0x00
 #define        IPTOS_CLASS_CS1                 0x20
 #define        IPTOS_CLASS_CS2                 0x40