mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-12-24 21:54:36 +02:00
[PATCH] ipv6: restore correct ECN handling on TCP xmit
Thanks Dave Taht git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26858 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
28e2aaeeb2
commit
318f8f9eeb
@ -0,0 +1,25 @@
|
||||
--- a/include/net/inet_ecn.h
|
||||
+++ b/include/net/inet_ecn.h
|
||||
@@ -38,9 +38,19 @@ static inline __u8 INET_ECN_encapsulate(__u8 outer, __u8 inner)
|
||||
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); \
|
@ -0,0 +1,25 @@
|
||||
--- a/include/net/inet_ecn.h
|
||||
+++ b/include/net/inet_ecn.h
|
||||
@@ -38,9 +38,19 @@ static inline __u8 INET_ECN_encapsulate(__u8 outer, __u8 inner)
|
||||
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); \
|
Loading…
Reference in New Issue
Block a user