hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sch_htb: remove unnecessary NULL pointer judgment 

It already has a NULL pointer judgment of rtab in qdisc_put_rtab().
Remove the judgment outside of qdisc_put_rtab().

Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Yang Yingliang 2013-12-11 15:48:37 +08:00 committed by David S. Miller
parent b601fa197f
commit 6b1dd85601
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
net/sched/sch_htb.c
View File

@ -1337,7 +1337,6 @@ static int htb_change_class(struct Qdisc *sch, u32 classid,
struct htb_sched *q = qdisc_priv(sch); struct htb_sched *q = qdisc_priv(sch);
struct htb_class *cl = (struct htb_class *)*arg, *parent; struct htb_class *cl = (struct htb_class *)*arg, *parent;
struct nlattr *opt = tca[TCA_OPTIONS]; struct nlattr *opt = tca[TCA_OPTIONS];
struct qdisc_rate_table *rtab = NULL, *ctab = NULL;
struct nlattr *tb[TCA_HTB_MAX + 1]; struct nlattr *tb[TCA_HTB_MAX + 1];
struct tc_htb_opt *hopt; struct tc_htb_opt *hopt;
u64 rate64, ceil64; u64 rate64, ceil64;
@ -1361,16 +1360,11 @@ static int htb_change_class(struct Qdisc *sch, u32 classid,
goto failure; goto failure;
/* Keeping backward compatible with rate_table based iproute2 tc */ /* Keeping backward compatible with rate_table based iproute2 tc */
if (hopt->rate.linklayer == TC_LINKLAYER_UNAWARE) { if (hopt->rate.linklayer == TC_LINKLAYER_UNAWARE)
rtab = qdisc_get_rtab(&hopt->rate, tb[TCA_HTB_RTAB]); qdisc_put_rtab(qdisc_get_rtab(&hopt->rate, tb[TCA_HTB_RTAB]));
if (rtab)
qdisc_put_rtab(rtab); if (hopt->ceil.linklayer == TC_LINKLAYER_UNAWARE)
} qdisc_put_rtab(qdisc_get_rtab(&hopt->ceil, tb[TCA_HTB_CTAB]));
if (hopt->ceil.linklayer == TC_LINKLAYER_UNAWARE) {
ctab = qdisc_get_rtab(&hopt->ceil, tb[TCA_HTB_CTAB]);
if (ctab)
qdisc_put_rtab(ctab);
}
if (!cl) { /* new class */ if (!cl) { /* new class */
struct Qdisc *new_q; struct Qdisc *new_q;