diff options
author | Lorenzo Colitti <lorenzo@google.com> | 2017-11-24 04:38:29 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-11-24 04:38:29 +0000 |
commit | 2d868b48b2f313deb4853e8ac5047d05132969c5 (patch) | |
tree | 4a56d9683737ec68d8f0e5615abfea118eec6426 /tc/q_choke.c | |
parent | 1934149f47ee4dfe2b22258c2e18f55a510b5889 (diff) | |
parent | ff27a837e601b1f0331b4700c167107b38475e31 (diff) | |
download | platform_external_iproute2-2d868b48b2f313deb4853e8ac5047d05132969c5.tar.gz platform_external_iproute2-2d868b48b2f313deb4853e8ac5047d05132969c5.tar.bz2 platform_external_iproute2-2d868b48b2f313deb4853e8ac5047d05132969c5.zip |
Merge changes Id0db30f6,I117dcabd,If21f95e2,I42c1ebfa am: 550751fdb7 am: ef18ea8cd8android-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r3android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1android-p-preview-3android-p-preview-2android-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devpie-b4s4-releasepie-b4s4-dev
am: ff27a837e6
Change-Id: I9bbf3abcb11c1f81c33de67dbe8ea88898fe8fa5
Diffstat (limited to 'tc/q_choke.c')
-rw-r--r-- | tc/q_choke.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/tc/q_choke.c b/tc/q_choke.c index bd9ceb84..a234d2e0 100644 --- a/tc/q_choke.c +++ b/tc/q_choke.c @@ -34,19 +34,17 @@ static void explain(void) static int choke_parse_opt(struct qdisc_util *qu, int argc, char **argv, struct nlmsghdr *n) { - struct tc_red_qopt opt; - unsigned burst = 0; - unsigned avpkt = 1000; + struct tc_red_qopt opt = {}; + unsigned int burst = 0; + unsigned int avpkt = 1000; double probability = 0.02; - unsigned rate = 0; + unsigned int rate = 0; int ecn_ok = 0; int wlog; __u8 sbuf[256]; __u32 max_P; struct rtattr *tail; - memset(&opt, 0, sizeof(opt)); - while (argc > 0) { if (strcmp(*argv, "limit") == 0) { NEXT_ARG(); |