| Message ID | 20200618040056.30792-1-gaurav1086@gmail.com |
|---|---|
| State | Rejected |
| 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 00:00:56 -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> > --- > net/sched/sch_api.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c > index 9a3449b56bd6..be93ebcdb18d 100644 > --- a/net/sched/sch_api.c > +++ b/net/sched/sch_api.c > @@ -1094,7 +1094,7 @@ static int qdisc_graft(struct net_device *dev, struct Qdisc *parent, > > /* Only support running class lockless if parent is lockless */ > if (new && (new->flags & TCQ_F_NOLOCK) && > - parent && !(parent->flags & TCQ_F_NOLOCK)) > + !(parent->flags & TCQ_F_NOLOCK)) You've broken the indentation of this line, it was correctly indented before your change.
diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c index 9a3449b56bd6..be93ebcdb18d 100644 --- a/net/sched/sch_api.c +++ b/net/sched/sch_api.c @@ -1094,7 +1094,7 @@ static int qdisc_graft(struct net_device *dev, struct Qdisc *parent, /* Only support running class lockless if parent is lockless */ if (new && (new->flags & TCQ_F_NOLOCK) && - parent && !(parent->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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)