xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: sched: refactor grafting Qdiscs with a parent

Browse Source 
The code for grafting Qdiscs when there is a parent has two needless
indentation levels, and breaks the "keep the success path unindented"
guideline.  Refactor.

Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: John Hurley <john.hurley@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jakub Kicinski
2018-11-07 17:33:38 -08:00
committed by David S. Miller
parent bfaee9113f
commit 9da93ece59
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
net/sched/sch_api.c
View File

@@ -1007,7 +1007,6 @@ static int qdisc_graft(struct net_device *dev, struct Qdisc *parent,
{ {
struct Qdisc *q = old; struct Qdisc *q = old;
struct net *net = dev_net(dev); struct net *net = dev_net(dev);
int err = 0;
if (parent == NULL) { if (parent == NULL) {
unsigned int i, num_q, ingress; unsigned int i, num_q, ingress;
@@ -1062,28 +1061,29 @@ skip:
dev_activate(dev); dev_activate(dev);
} else { } else {
const struct Qdisc_class_ops *cops = parent->ops->cl_ops; const struct Qdisc_class_ops *cops = parent->ops->cl_ops;
unsigned long cl;
int err;
/* Only support running class lockless if parent is lockless */ /* Only support running class lockless if parent is lockless */
if (new && (new->flags & TCQ_F_NOLOCK) && if (new && (new->flags & TCQ_F_NOLOCK) &&
parent && !(parent->flags & TCQ_F_NOLOCK)) parent && !(parent->flags & TCQ_F_NOLOCK))
new->flags &= ~TCQ_F_NOLOCK; new->flags &= ~TCQ_F_NOLOCK;
err = -EOPNOTSUPP; if (!cops || !cops->graft)
if (cops && cops->graft) { return -EOPNOTSUPP;
unsigned long cl = cops->find(parent, classid);
if (cl) { cl = cops->find(parent, classid);
err = cops->graft(parent, cl, new, &old, if (!cl) {
extack);
} else {
NL_SET_ERR_MSG(extack, "Specified class not found"); NL_SET_ERR_MSG(extack, "Specified class not found");
err = -ENOENT; return -ENOENT;
} }
}
if (!err) err = cops->graft(parent, cl, new, &old, extack);
if (err)
return err;
notify_and_destroy(net, skb, n, classid, old, new); notify_and_destroy(net, skb, n, classid, old, new);
} }
return err; return 0;
} }
static int qdisc_block_indexes_set(struct Qdisc *sch, struct nlattr **tca, static int qdisc_block_indexes_set(struct Qdisc *sch, struct nlattr **tca,