about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2010-08-11 07:44:03 -0700
committerAndreas Schwab <schwab@redhat.com>2010-12-06 10:18:46 +0100
commit745cb72f04667f7551e86e87fffd08bb316aae13 (patch)
tree857d9714dcaf1f9030b0bd7d0d8458e10530c7ca
parent5657e17a40c738f6dbd675abc3dd666256fddc16 (diff)
downloadglibc-745cb72f04667f7551e86e87fffd08bb316aae13.tar.gz
glibc-745cb72f04667f7551e86e87fffd08bb316aae13.tar.xz
glibc-745cb72f04667f7551e86e87fffd08bb316aae13.zip
Fix IPTOS_CLASS definition.
(cherry picked from commit 15bac72bac03faeb3b725b1d208c62160f0c3ad7)
-rw-r--r--ChangeLog6
-rw-r--r--sysdeps/generic/netinet/ip.h5
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index dc80bd3582..a78f96d61f 100644
--- 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 a837b98143..4955fee3ea 100644
--- 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