forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

net_sched: act: clean up notification functions

Browse source 
Refactor tcf_add_notify() and factor out tcf_del_notify().

Cc: Jamal Hadi Salim <jhs@mojatatu.com>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
WANG Cong 2014-01-09 16:14:00 -08:00 • committed by David S. Miller
commit a56e19538d
1 changed files with 40 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

95
net/sched/act_api.c
View file

@ -788,6 +788,33 @@ noflush_out:
return err; return err;
} }
static int
tcf_del_notify(struct net *net, struct nlmsghdr *n, struct list_head *actions,
u32 portid)
{
int ret;
struct sk_buff *skb;
skb = alloc_skb(NLMSG_GOODSIZE, GFP_KERNEL);
if (!skb)
return -ENOBUFS;
if (tca_get_fill(skb, actions, portid, n->nlmsg_seq, 0, RTM_DELACTION,
0, 1) <= 0) {
kfree_skb(skb);
return -EINVAL;
}
/* now do the delete */
tcf_action_destroy(actions, 0);
ret = rtnetlink_send(skb, net, portid, RTNLGRP_TC,
n->nlmsg_flags & NLM_F_ECHO);
if (ret > 0)
return 0;
return ret;
}
static int static int
tca_action_gd(struct net *net, struct nlattr *nla, struct nlmsghdr *n, tca_action_gd(struct net *net, struct nlattr *nla, struct nlmsghdr *n,
u32 portid, int event) u32 portid, int event)
@ -821,27 +848,9 @@ tca_action_gd(struct net *net, struct nlattr *nla, struct nlmsghdr *n,
if (event == RTM_GETACTION) if (event == RTM_GETACTION)
ret = act_get_notify(net, portid, n, &actions, event); ret = act_get_notify(net, portid, n, &actions, event);
else { /* delete */ else { /* delete */
struct sk_buff *skb; ret = tcf_del_notify(net, n, &actions, portid);
if (ret)
skb = alloc_skb(NLMSG_GOODSIZE, GFP_KERNEL);
if (!skb) {
ret = -ENOBUFS;
goto err; goto err;
}
if (tca_get_fill(skb, &actions, portid, n->nlmsg_seq, 0, event,
0, 1) <= 0) {
kfree_skb(skb);
ret = -EINVAL;
goto err;
}
/* now do the delete */
tcf_action_destroy(&actions, 0);
ret = rtnetlink_send(skb, net, portid, RTNLGRP_TC,
n->nlmsg_flags & NLM_F_ECHO);
if (ret > 0)
return 0;
return ret; return ret;
} }
err: err:
@ -849,60 +858,36 @@ err:
return ret; return ret;
} }
static int tcf_add_notify(struct net *net, struct list_head *actions, static int
u32 portid, u32 seq, int event, u16 flags) tcf_add_notify(struct net *net, struct nlmsghdr *n, struct list_head *actions,
u32 portid)
{ {
struct tcamsg *t;
struct nlmsghdr *nlh;
struct sk_buff *skb; struct sk_buff *skb;
struct nlattr *nest;
unsigned char *b;
int err = 0; int err = 0;
skb = alloc_skb(NLMSG_GOODSIZE, GFP_KERNEL); skb = alloc_skb(NLMSG_GOODSIZE, GFP_KERNEL);
if (!skb) if (!skb)
return -ENOBUFS; return -ENOBUFS;
b = skb_tail_pointer(skb); if (tca_get_fill(skb, actions, portid, n->nlmsg_seq, n->nlmsg_flags,
RTM_NEWACTION, 0, 0) <= 0) {
kfree_skb(skb);
return -EINVAL;
}
nlh = nlmsg_put(skb, portid, seq, event, sizeof(*t), flags); err = rtnetlink_send(skb, net, portid, RTNLGRP_TC,
if (!nlh) n->nlmsg_flags & NLM_F_ECHO);
goto out_kfree_skb;
t = nlmsg_data(nlh);
t->tca_family = AF_UNSPEC;
t->tca__pad1 = 0;
t->tca__pad2 = 0;
nest = nla_nest_start(skb, TCA_ACT_TAB);
if (nest == NULL)
goto out_kfree_skb;
if (tcf_action_dump(skb, actions, 0, 0) < 0)
goto out_kfree_skb;
nla_nest_end(skb, nest);
nlh->nlmsg_len = skb_tail_pointer(skb) - b;
NETLINK_CB(skb).dst_group = RTNLGRP_TC;
err = rtnetlink_send(skb, net, portid, RTNLGRP_TC, flags & NLM_F_ECHO);
if (err > 0) if (err > 0)
err = 0; err = 0;
return err; return err;
out_kfree_skb:
kfree_skb(skb);
return -1;
} }
static int static int
tcf_action_add(struct net *net, struct nlattr *nla, struct nlmsghdr *n, tcf_action_add(struct net *net, struct nlattr *nla, struct nlmsghdr *n,
u32 portid, int ovr) u32 portid, int ovr)
{ {
int ret = 0; int ret = 0;
LIST_HEAD(actions); LIST_HEAD(actions);
u32 seq = n->nlmsg_seq;
ret = tcf_action_init(net, nla, NULL, NULL, ovr, 0, &actions); ret = tcf_action_init(net, nla, NULL, NULL, ovr, 0, &actions);
if (ret) if (ret)
@ -911,7 +896,7 @@ tcf_action_add(struct net *net, struct nlattr *nla, struct nlmsghdr *n,
/* dump then free all the actions after update; inserted policy /* dump then free all the actions after update; inserted policy
* stays intact * stays intact
*/ */
ret = tcf_add_notify(net, &actions, portid, seq, RTM_NEWACTION, n->nlmsg_flags); ret = tcf_add_notify(net, n, &actions, portid);
cleanup_a(&actions); cleanup_a(&actions);
done: done:
return ret; return ret;