git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.3
[linux-2.6.git]
/
net
/
sched
/
sch_red.c
diff --git
a/net/sched/sch_red.c
b/net/sched/sch_red.c
index
5630abb
..
e98f79b
100644
(file)
--- a/
net/sched/sch_red.c
+++ b/
net/sched/sch_red.c
@@
-40,6
+40,7
@@
#include <net/sock.h>
#include <net/pkt_sched.h>
#include <net/inet_ecn.h>
#include <net/sock.h>
#include <net/pkt_sched.h>
#include <net/inet_ecn.h>
+#include <net/dsfield.h>
/* Random Early Detection (RED) algorithm.
/* Random Early Detection (RED) algorithm.
@@
-162,13
+163,12
@@
static int red_ecn_mark(struct sk_buff *skb)
switch (skb->protocol) {
case __constant_htons(ETH_P_IP):
switch (skb->protocol) {
case __constant_htons(ETH_P_IP):
- if (
!INET_ECN_is_capable
(skb->nh.iph->tos))
+ if (
INET_ECN_is_not_ect
(skb->nh.iph->tos))
return 0;
return 0;
- if (INET_ECN_is_not_ce(skb->nh.iph->tos))
- IP_ECN_set_ce(skb->nh.iph);
+ IP_ECN_set_ce(skb->nh.iph);
return 1;
case __constant_htons(ETH_P_IPV6):
return 1;
case __constant_htons(ETH_P_IPV6):
- if (
!INET_ECN_is_capable(ip
6_get_dsfield(skb->nh.ipv6h)))
+ if (
INET_ECN_is_not_ect(ipv
6_get_dsfield(skb->nh.ipv6h)))
return 0;
IP6_ECN_set_ce(skb->nh.ipv6h);
return 1;
return 0;
IP6_ECN_set_ce(skb->nh.ipv6h);
return 1;