Merge commit 'v2.6.33-rc5' into next

1 files changed, 2 insertions, 4 deletions

diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h
index 14fc906ed602..05330fc5b436 100644
--- a/include/linux/rtnetlink.h
+++ b/include/linux/rtnetlink.h
@@ -368,11 +368,9 @@ enum {
 #define RTAX_MAX (__RTAX_MAX - 1)
 
 #define RTAX_FEATURE_ECN        0x00000001
-#define RTAX_FEATURE_NO_SACK    0x00000002
-#define RTAX_FEATURE_NO_TSTAMP  0x00000004
+#define RTAX_FEATURE_SACK       0x00000002
+#define RTAX_FEATURE_TIMESTAMP  0x00000004
 #define RTAX_FEATURE_ALLFRAG    0x00000008
-#define RTAX_FEATURE_NO_WSCALE  0x00000010
-#define RTAX_FEATURE_NO_DSACK   0x00000020
 
 struct rta_session {
         __u8    proto;