Commit-ID: 00093fab980d0a8950a64bdf9e346d0497b9a7e4 Gitweb: http://git.kernel.org/tip/00093fab980d0a8950a64bdf9e346d0497b9a7e4 Author: Dan Carpenter <error27@xxxxxxxxx> AuthorDate: Sat, 14 Aug 2010 11:09:49 +0000 Committer: David S. Miller <davem@xxxxxxxxxxxxx> CommitDate: Wed, 18 Aug 2010 14:24:51 -0700 net/sched: remove unneeded NULL check There is no need to check "s". nla_data() doesn't return NULL. Also we already dereferenced "s" at this point so it would have oopsed ealier if it were NULL. Signed-off-by: Dan Carpenter <error27@xxxxxxxxx> Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx> --- net/sched/sch_api.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c index 408eea7..6fb3d41 100644 --- a/net/sched/sch_api.c +++ b/net/sched/sch_api.c @@ -360,7 +360,7 @@ static struct qdisc_size_table *qdisc_get_stab(struct nlattr *opt) tsize = nla_len(tb[TCA_STAB_DATA]) / sizeof(u16); } - if (!s || tsize != s->tsize || (!tab && tsize > 0)) + if (tsize != s->tsize || (!tab && tsize > 0)) return ERR_PTR(-EINVAL); spin_lock(&qdisc_stab_lock); -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|