net/sched: Remove unnecessary judgment statements
Subsystems (3)
PATCH 2/2 net/sched: Remove unnecessary judgment statements
It has been deal with the 'if (err' statement in rtnl_{send, unicast}, so use rtnl_{send, unicast} instead of netlink_{send, unicast}.
Signed-off-by Yajun Deng <[email protected]>
--- net/sched/act_api.c | 20 ++++++-------------- net/sched/cls_api.c | 28 +++++++++++----------------- net/sched/sch_api.c | 18 ++++++------------ 3 files changed, 23 insertions(+), 43 deletions(-)
net/sched/act_api.c +6 -14
@@ -1349,10 +1349,8 @@ static int tca_action_flush(struct net *net, struct nlattr *nla, nlh->nlmsg_len =skb_tail_pointer (skb) - b; nlh->nlmsg_flags |=NLM_F_ROOT ;module_put (ops->owner); - err =rtnetlink_send (skb, net, portid,RTNLGRP_TC , - n->nlmsg_flags &NLM_F_ECHO ); -if (err >0 ) -return 0 ; + err =rtnl_send (skb, net, portid,RTNLGRP_TC , + n->nlmsg_flags &NLM_F_ECHO );if (err <0 )NL_SET_ERR_MSG (extack,"Failed to send TC action flush notification" );
@@ -1421,10 +1419,8 @@ tcf_del_notify(struct net *net, struct nlmsghdr *n, struct tc_action *actions[],return ret; } - ret =rtnetlink_send (skb, net, portid,RTNLGRP_TC , - n->nlmsg_flags &NLM_F_ECHO ); -if (ret >0 ) -return 0 ; + ret =rtnl_send (skb, net, portid,RTNLGRP_TC , + n->nlmsg_flags &NLM_F_ECHO );return ret; }
@@ -1481,7 +1477,6 @@ tcf_add_notify(struct net *net, struct nlmsghdr *n, struct tc_action *actions[], u32 portid, size_t attr_size, struct netlink_ext_ack *extack) { struct sk_buff *skb; -int err =0 ; skb =alloc_skb (attr_size <=NLMSG_GOODSIZE ?NLMSG_GOODSIZE : attr_size,GFP_KERNEL );
@@ -1495,11 +1490,8 @@ tcf_add_notify(struct net *net, struct nlmsghdr *n, struct tc_action *actions[],return -EINVAL ; } - err =rtnetlink_send (skb, net, portid,RTNLGRP_TC , - n->nlmsg_flags &NLM_F_ECHO ); -if (err >0 ) - err =0 ; -return err; +return rtnl_send (skb, net, portid,RTNLGRP_TC , + n->nlmsg_flags &NLM_F_ECHO ); } static int tcf_action_add(struct net *net, struct nlattr *nla,
net/sched/cls_api.c +11 -17
@@ -1870,13 +1870,11 @@ static int tfilter_notify(struct net *net, struct sk_buff *oskb, }if (unicast) - err =netlink_unicast (net->rtnl, skb, portid,MSG_DONTWAIT ); + err =rtnl_unicast (skb, net, portid);else - err =rtnetlink_send (skb, net, portid,RTNLGRP_TC , - n->nlmsg_flags &NLM_F_ECHO ); + err =rtnl_send (skb, net, portid,RTNLGRP_TC , + n->nlmsg_flags &NLM_F_ECHO ); -if (err >0 ) - err =0 ;return err; }
@@ -1909,15 +1907,13 @@ static int tfilter_del_notify(struct net *net, struct sk_buff *oskb, }if (unicast) - err =netlink_unicast (net->rtnl, skb, portid,MSG_DONTWAIT ); + err =rtnl_unicast (skb, net, portid);else - err =rtnetlink_send (skb, net, portid,RTNLGRP_TC , - n->nlmsg_flags &NLM_F_ECHO ); + err =rtnl_send (skb, net, portid,RTNLGRP_TC , + n->nlmsg_flags &NLM_F_ECHO );if (err <0 )NL_SET_ERR_MSG (extack,"Failed to send filter delete notification" ); -if (err >0 ) - err =0 ;return err; }
@@ -2711,13 +2707,11 @@ static int tc_chain_notify(struct tcf_chain *chain, struct sk_buff *oskb, }if (unicast) - err =netlink_unicast (net->rtnl, skb, portid,MSG_DONTWAIT ); + err =rtnl_unicast (skb, net, portid);else - err =rtnetlink_send (skb, net, portid,RTNLGRP_TC , - flags &NLM_F_ECHO ); + err =rtnl_send (skb, net, portid,RTNLGRP_TC , + flags &NLM_F_ECHO ); -if (err >0 ) - err =0 ;return err; }
@@ -2741,9 +2735,9 @@ static int tc_chain_notify_delete(const struct tcf_proto_ops *tmplt_ops, }if (unicast) -return netlink_unicast (net->rtnl, skb, portid,MSG_DONTWAIT ); +return rtnl_unicast (skb, net, portid); -return rtnetlink_send (skb, net, portid,RTNLGRP_TC , flags &NLM_F_ECHO ); +return rtnl_send (skb, net, portid,RTNLGRP_TC , flags &NLM_F_ECHO ); } static int tc_chain_tmplt_add(struct tcf_chain *chain, struct net *net,
net/sched/sch_api.c +6 -12
@@ -987,8 +987,8 @@ static int qdisc_notify(struct net *net, struct sk_buff *oskb, }if (skb->len) -return rtnetlink_send (skb, net, portid,RTNLGRP_TC , - n->nlmsg_flags &NLM_F_ECHO ); +return rtnl_send (skb, net, portid,RTNLGRP_TC , + n->nlmsg_flags &NLM_F_ECHO ); err_out:kfree_skb (skb);
@@ -1845,7 +1845,6 @@ static int tclass_notify(struct net *net, struct sk_buff *oskb, {struct sk_buff *skb;u32 portid = oskb ?NETLINK_CB (oskb).portid :0 ; -int err =0 ; skb =alloc_skb (NLMSG_GOODSIZE ,GFP_KERNEL );if (!skb)
@@ -1856,11 +1855,8 @@ static int tclass_notify(struct net *net, struct sk_buff *oskb,return -EINVAL ; } - err =rtnetlink_send (skb, net, portid,RTNLGRP_TC , - n->nlmsg_flags &NLM_F_ECHO ); -if (err >0 ) - err =0 ; -return err; +return rtnl_send (skb, net, portid,RTNLGRP_TC , + n->nlmsg_flags &NLM_F_ECHO ); } static int tclass_del_notify(struct net *net,
@@ -1892,10 +1888,8 @@ static int tclass_del_notify(struct net *net,return err; } - err =rtnetlink_send (skb, net, portid,RTNLGRP_TC , - n->nlmsg_flags &NLM_F_ECHO ); -if (err >0 ) - err =0 ; + err =rtnl_send (skb, net, portid,RTNLGRP_TC , + n->nlmsg_flags &NLM_F_ECHO );return err; }
Signature · 1 line
2.32.0