Commit 37cfee90 authored by Florent Fourcot's avatar Florent Fourcot Committed by David S. Miller

ipv6: move IPV6_TCLASS_MASK definition in ipv6.h

Signed-off-by: default avatarFlorent Fourcot <florent.fourcot@enst-bretagne.fr>
Reviewed-by: default avatarHannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1397ed35
...@@ -238,6 +238,7 @@ struct ip6_flowlabel { ...@@ -238,6 +238,7 @@ struct ip6_flowlabel {
#define IPV6_FLOWINFO_MASK cpu_to_be32(0x0FFFFFFF) #define IPV6_FLOWINFO_MASK cpu_to_be32(0x0FFFFFFF)
#define IPV6_FLOWLABEL_MASK cpu_to_be32(0x000FFFFF) #define IPV6_FLOWLABEL_MASK cpu_to_be32(0x000FFFFF)
#define IPV6_TCLASS_MASK (IPV6_FLOWINFO_MASK & ~IPV6_FLOWLABEL_MASK)
struct ipv6_fl_socklist { struct ipv6_fl_socklist {
struct ipv6_fl_socklist __rcu *next; struct ipv6_fl_socklist __rcu *next;
......
...@@ -61,7 +61,6 @@ static bool log_ecn_error = true; ...@@ -61,7 +61,6 @@ static bool log_ecn_error = true;
module_param(log_ecn_error, bool, 0644); module_param(log_ecn_error, bool, 0644);
MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN"); MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN");
#define IPV6_TCLASS_MASK (IPV6_FLOWINFO_MASK & ~IPV6_FLOWLABEL_MASK)
#define IPV6_TCLASS_SHIFT 20 #define IPV6_TCLASS_SHIFT 20
#define HASH_SIZE_SHIFT 5 #define HASH_SIZE_SHIFT 5
......
...@@ -70,7 +70,6 @@ MODULE_ALIAS_NETDEV("ip6tnl0"); ...@@ -70,7 +70,6 @@ MODULE_ALIAS_NETDEV("ip6tnl0");
#define IP6_TNL_TRACE(x...) do {;} while(0) #define IP6_TNL_TRACE(x...) do {;} while(0)
#endif #endif
#define IPV6_TCLASS_MASK (IPV6_FLOWINFO_MASK & ~IPV6_FLOWLABEL_MASK)
#define IPV6_TCLASS_SHIFT 20 #define IPV6_TCLASS_SHIFT 20
#define HASH_SIZE_SHIFT 5 #define HASH_SIZE_SHIFT 5
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment