diff options
-rw-r--r-- | include/net/ipv6.h | 1 | ||||
-rw-r--r-- | net/ipv6/ip6_gre.c | 1 | ||||
-rw-r--r-- | net/ipv6/ip6_tunnel.c | 1 |
3 files changed, 1 insertions, 2 deletions
diff --git a/include/net/ipv6.h b/include/net/ipv6.h index 488316e339a1..bce802e7bcfd 100644 --- a/include/net/ipv6.h +++ b/include/net/ipv6.h | |||
@@ -238,6 +238,7 @@ struct ip6_flowlabel { | |||
238 | 238 | ||
239 | #define IPV6_FLOWINFO_MASK cpu_to_be32(0x0FFFFFFF) | 239 | #define IPV6_FLOWINFO_MASK cpu_to_be32(0x0FFFFFFF) |
240 | #define IPV6_FLOWLABEL_MASK cpu_to_be32(0x000FFFFF) | 240 | #define IPV6_FLOWLABEL_MASK cpu_to_be32(0x000FFFFF) |
241 | #define IPV6_TCLASS_MASK (IPV6_FLOWINFO_MASK & ~IPV6_FLOWLABEL_MASK) | ||
241 | 242 | ||
242 | struct ipv6_fl_socklist { | 243 | struct ipv6_fl_socklist { |
243 | struct ipv6_fl_socklist __rcu *next; | 244 | struct ipv6_fl_socklist __rcu *next; |
diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c index 8acb28621f9c..c50de068bea2 100644 --- a/net/ipv6/ip6_gre.c +++ b/net/ipv6/ip6_gre.c | |||
@@ -61,7 +61,6 @@ static bool log_ecn_error = true; | |||
61 | module_param(log_ecn_error, bool, 0644); | 61 | module_param(log_ecn_error, bool, 0644); |
62 | MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN"); | 62 | MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN"); |
63 | 63 | ||
64 | #define IPV6_TCLASS_MASK (IPV6_FLOWINFO_MASK & ~IPV6_FLOWLABEL_MASK) | ||
65 | #define IPV6_TCLASS_SHIFT 20 | 64 | #define IPV6_TCLASS_SHIFT 20 |
66 | 65 | ||
67 | #define HASH_SIZE_SHIFT 5 | 66 | #define HASH_SIZE_SHIFT 5 |
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c index d6062325db08..f5e8a98eb55e 100644 --- a/net/ipv6/ip6_tunnel.c +++ b/net/ipv6/ip6_tunnel.c | |||
@@ -70,7 +70,6 @@ MODULE_ALIAS_NETDEV("ip6tnl0"); | |||
70 | #define IP6_TNL_TRACE(x...) do {;} while(0) | 70 | #define IP6_TNL_TRACE(x...) do {;} while(0) |
71 | #endif | 71 | #endif |
72 | 72 | ||
73 | #define IPV6_TCLASS_MASK (IPV6_FLOWINFO_MASK & ~IPV6_FLOWLABEL_MASK) | ||
74 | #define IPV6_TCLASS_SHIFT 20 | 73 | #define IPV6_TCLASS_SHIFT 20 |
75 | 74 | ||
76 | #define HASH_SIZE_SHIFT 5 | 75 | #define HASH_SIZE_SHIFT 5 |