aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2010-08-11 07:44:03 -0700
committerUlrich Drepper <drepper@redhat.com>2010-08-11 07:44:03 -0700
commit15bac72bac03faeb3b725b1d208c62160f0c3ad7 (patch)
treee1e2872cce8dcf83c80a746c6bf4a2b5dc142a09
parentc3e2f19bb995a0281f4cc56ad81bd67a5404dde6 (diff)
downloadglibc-15bac72bac03faeb3b725b1d208c62160f0c3ad7.zip
glibc-15bac72bac03faeb3b725b1d208c62160f0c3ad7.tar.gz
glibc-15bac72bac03faeb3b725b1d208c62160f0c3ad7.tar.bz2
Fix IPTOS_CLASS definition.
-rw-r--r--ChangeLog4
-rw-r--r--NEWS4
-rw-r--r--sysdeps/generic/netinet/ip.h5
3 files changed, 8 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 8d267c9..96655d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +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>.
+
* nss/Makefile: Add rules to build and run tst-nss-test1.
* shlib-versions: Add entry for libnss_test1.
* nss/nss_test1.c: New file.
diff --git a/NEWS b/NEWS
index a7de685..e51fba9 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-GNU C Library NEWS -- history of user-visible changes. 2010-8-9
+GNU C Library NEWS -- history of user-visible changes. 2010-8-11
Copyright (C) 1992-2009, 2010 Free Software Foundation, Inc.
See the end for copying conditions.
@@ -9,7 +9,7 @@ Version 2.13
* The following bugs are resolved with this release:
- 11640, 11701, 11840, 11856, 11883
+ 11640, 11701, 11840, 11856, 11883, 11903
* POWER7 optimizations: memset, memcmp, strncmp
diff --git a/sysdeps/generic/netinet/ip.h b/sysdeps/generic/netinet/ip.h
index a837b98..4955fee 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