diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-10 23:18:26 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-10 23:18:26 +0000 |
| commit | c7c4310f7fc1485925d800628bf50b3aeab535ef (patch) | |
| tree | b12aa4be0e8fb82aaaea97fb475e793e8a347c49 /net/sched | |
| parent | 1ffd1d069ca4c5ffe16fea6175dab1b9bbb15820 (diff) | |
Merge with Linux 2.4.0-test3-pre8. Linus has accepted most of what
I've sent him, so we're very close to full integration of the MIPS
port into his sources.
Diffstat (limited to 'net/sched')
| -rw-r--r-- | net/sched/sch_red.c | 10 | ||||
| -rw-r--r-- | net/sched/sch_teql.c | 6 |
2 files changed, 6 insertions, 10 deletions
diff --git a/net/sched/sch_red.c b/net/sched/sch_red.c index d8c117247..1a4a501c9 100644 --- a/net/sched/sch_red.c +++ b/net/sched/sch_red.c @@ -39,6 +39,7 @@ #include <linux/skbuff.h> #include <net/sock.h> #include <net/pkt_sched.h> +#include <net/inet_ecn.h> #define RED_ECN_ECT 0x02 #define RED_ECN_CE 0x01 @@ -170,14 +171,9 @@ static int red_ecn_mark(struct sk_buff *skb) if (!(tos & RED_ECN_ECT)) return 0; - if (!(tos & RED_ECN_CE)) { - u32 check = skb->nh.iph->check; + if (!(tos & RED_ECN_CE)) + IP_ECN_set_ce(skb->nh.iph); - check += __constant_htons(0xFFFE); - skb->nh.iph->check = check + (check>>16); - - skb->nh.iph->tos = tos | RED_ECN_CE; - } return 1; } diff --git a/net/sched/sch_teql.c b/net/sched/sch_teql.c index 7ea61ce5c..1b7119ffd 100644 --- a/net/sched/sch_teql.c +++ b/net/sched/sch_teql.c @@ -242,9 +242,9 @@ __teql_resolve(struct sk_buff *skb, struct sk_buff *skb_res, struct net_device * memcmp(n->primary_key, mn->primary_key, mn->tbl->key_len) == 0) { atomic_inc(&n->refcnt); } else { - n = __neigh_lookup(mn->tbl, mn->primary_key, dev, 1); - if (n == NULL) - return -ENOBUFS; + n = __neigh_lookup_errno(mn->tbl, mn->primary_key, dev); + if (IS_ERR(n)) + return PTR_ERR(n); } if (neigh_event_send(n, skb_res) == 0) { int err; |