From e9bc3c40d0c96fff2236b404dc93de511ac1a301 Mon Sep 17 00:00:00 2001 From: shemminger Date: Sat, 10 Dec 2005 00:01:02 +0000 Subject: [PATCH] Always send reorder message (for compatiablity) and parse response correctly with netem. --- ChangeLog | 2 +- tc/q_netem.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0d057ecd..09a0373b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -2005-12-02 Stephen Hemminger +2005-12-09 Stephen Hemminger * Add corrupt feature to netem diff --git a/tc/q_netem.c b/tc/q_netem.c index a04a6f2c..757edcae 100644 --- a/tc/q_netem.c +++ b/tc/q_netem.c @@ -273,10 +273,8 @@ static int netem_parse_opt(struct qdisc_util *qu, int argc, char **argv, return -1; } - if (reorder.probability) { - if (addattr_l(n, TCA_BUF_MAX, TCA_NETEM_REORDER, &reorder, sizeof(reorder)) < 0) - return -1; - } + if (addattr_l(n, TCA_BUF_MAX, TCA_NETEM_REORDER, &reorder, sizeof(reorder)) < 0) + return -1; if (corrupt.probability) { if (addattr_l(n, TCA_BUF_MAX, TCA_NETEM_CORRUPT, &corrupt, sizeof(corrupt)) < 0) @@ -328,7 +326,7 @@ static int netem_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt) if (tb[TCA_NETEM_CORRUPT]) { if (RTA_PAYLOAD(tb[TCA_NETEM_CORRUPT]) < sizeof(*corrupt)) return -1; - corrupt = RTA_DATA(tb[TCA_NETEM_REORDER]); + corrupt = RTA_DATA(tb[TCA_NETEM_CORRUPT]); } }