| Message ID | 20200618203632.15438-1-gaurav1086@gmail.com |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net/sched] : Remove redundant condition in qdisc_graft | expand |
From: Gaurav Singh <gaurav1086@gmail.com> Date: Thu, 18 Jun 2020 16:36:31 -0400 > parent cannot be NULL here since its in the else part > of the if (parent == NULL) condition. Remove the extra > check on parent pointer. > > Signed-off-by: Gaurav Singh <gaurav1086@gmail.com> Applied to net-next, thanks.
diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c index 9a3449b56bd6..11ebba60da3b 100644 --- a/net/sched/sch_api.c +++ b/net/sched/sch_api.c @@ -1093,8 +1093,7 @@ static int qdisc_graft(struct net_device *dev, struct Qdisc *parent, int err; /* Only support running class lockless if parent is lockless */ - if (new && (new->flags & TCQ_F_NOLOCK) && - parent && !(parent->flags & TCQ_F_NOLOCK)) + if (new && (new->flags & TCQ_F_NOLOCK) && !(parent->flags & TCQ_F_NOLOCK)) qdisc_clear_nolock(new); if (!cops || !cops->graft)
parent cannot be NULL here since its in the else part of the if (parent == NULL) condition. Remove the extra check on parent pointer. Signed-off-by: Gaurav Singh <gaurav1086@gmail.com> --- net/sched/sch_api.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)