Commit 578fef42 authored by Patrick McHardy's avatar Patrick McHardy

[PKT_SCHED]: Fix ipv6 ECN marking in RED scheduler.

parent 0242b389
...@@ -41,9 +41,6 @@ ...@@ -41,9 +41,6 @@
#include <net/pkt_sched.h> #include <net/pkt_sched.h>
#include <net/inet_ecn.h> #include <net/inet_ecn.h>
#define RED_ECN_ECT 0x02
#define RED_ECN_CE 0x01
/* Random Early Detection (RED) algorithm. /* Random Early Detection (RED) algorithm.
======================================= =======================================
...@@ -165,28 +162,16 @@ static int red_ecn_mark(struct sk_buff *skb) ...@@ -165,28 +162,16 @@ static int red_ecn_mark(struct sk_buff *skb)
switch (skb->protocol) { switch (skb->protocol) {
case __constant_htons(ETH_P_IP): case __constant_htons(ETH_P_IP):
{ if (!INET_ECN_is_capable(skb->nh.iph->tos))
u8 tos = skb->nh.iph->tos;
if (!(tos & RED_ECN_ECT))
return 0; return 0;
if (INET_ECN_is_not_ce(skb->nh.iph->tos))
if (!(tos & RED_ECN_CE))
IP_ECN_set_ce(skb->nh.iph); IP_ECN_set_ce(skb->nh.iph);
return 1; return 1;
}
case __constant_htons(ETH_P_IPV6): case __constant_htons(ETH_P_IPV6):
{ if (!INET_ECN_is_capable(ip6_get_dsfield(skb->nh.ipv6h)))
u32 label = *(u32*)skb->nh.raw;
if (!(label & __constant_htonl(RED_ECN_ECT<<20)))
return 0; return 0;
label |= __constant_htonl(RED_ECN_CE<<20); IP6_ECN_set_ce(skb->nh.ipv6h);
return 1; return 1;
}
default: default:
return 0; return 0;
} }
......
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