2011-05-08 17:08:06 +00:00
|
|
|
--- a/include/net/inet_ecn.h
|
|
|
|
|
+++ b/include/net/inet_ecn.h
|
2011-05-15 17:23:02 +00:00
|
|
|
@@ -38,9 +38,19 @@ static inline __u8 INET_ECN_encapsulate(
|
2011-05-08 17:08:06 +00:00
|
|
|
return outer;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
-#define INET_ECN_xmit(sk) do { inet_sk(sk)->tos |= INET_ECN_ECT_0; } while (0)
|
|
|
|
|
-#define INET_ECN_dontxmit(sk) \
|
|
|
|
|
- do { inet_sk(sk)->tos &= ~INET_ECN_MASK; } while (0)
|
|
|
|
|
+static inline void INET_ECN_xmit(struct sock *sk)
|
|
|
|
|
+{
|
|
|
|
|
+ inet_sk(sk)->tos |= INET_ECN_ECT_0;
|
|
|
|
|
+ if (inet6_sk(sk) != NULL)
|
|
|
|
|
+ inet6_sk(sk)->tclass |= INET_ECN_ECT_0;
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
|
|
+static inline void INET_ECN_dontxmit(struct sock *sk)
|
|
|
|
|
+{
|
|
|
|
|
+ inet_sk(sk)->tos &= ~INET_ECN_MASK;
|
|
|
|
|
+ if (inet6_sk(sk) != NULL)
|
|
|
|
|
+ inet6_sk(sk)->tclass &= ~INET_ECN_MASK;
|
|
|
|
|
+}
|
|
|
|
|
|
|
|
|
|
#define IP6_ECN_flow_init(label) do { \
|
|
|
|
|
(label) &= ~htonl(INET_ECN_MASK << 20); \
|
