Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cc7ec456 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

net_sched: cleanups 



Cleanup net/sched code to current CodingStyle and practices.

Reduce inline abuse

Signed-off-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7180a031

net/sched/act_api.c

+23 −23
Original line number Diff line number Diff line
@@ -447,7 +447,8 @@ tcf_action_dump_1(struct sk_buff *skb, struct tc_action *a, int bind, int ref) 
	nest = nla_nest_start(skb, TCA_OPTIONS);

	if (nest == NULL)

		goto nla_put_failure;

	if ((err = tcf_action_dump_old(skb, a, bind, ref)) > 0) {

	err = tcf_action_dump_old(skb, a, bind, ref);

	if (err > 0) {

		nla_nest_end(skb, nest);

		return err;

	}
@@ -549,8 +550,8 @@ struct tc_action *tcf_action_init_1(struct nlattr *nla, struct nlattr *est, 
		goto err_free;



	/* module count goes up only when brand new policy is created

	   if it exists and is only bound to in a_o->init() then

	   ACT_P_CREATED is not returned (a zero is).

	 * if it exists and is only bound to in a_o->init() then

	 * ACT_P_CREATED is not returned (a zero is).

	 */

	if (err != ACT_P_CREATED)

		module_put(a_o->owner);
@@ -821,7 +822,8 @@ static int tca_action_flush(struct net *net, struct nlattr *nla, 
	nlh->nlmsg_flags |= NLM_F_ROOT;

	module_put(a->ops->owner);

	kfree(a);

	err = rtnetlink_send(skb, net, pid, RTNLGRP_TC, n->nlmsg_flags&NLM_F_ECHO);

	err = rtnetlink_send(skb, net, pid, RTNLGRP_TC,

			     n->nlmsg_flags & NLM_F_ECHO);

	if (err > 0)

		return 0;
@@ -967,7 +969,7 @@ tcf_action_add(struct net *net, struct nlattr *nla, struct nlmsghdr *n, 


	/* dump then free all the actions after update; inserted policy

	 * stays intact

	 * */

	 */

	ret = tcf_add_notify(net, act, pid, seq, RTM_NEWACTION, n->nlmsg_flags);

	for (a = act; a; a = act) {

		act = a->next;
@@ -993,8 +995,7 @@ static int tc_ctl_action(struct sk_buff *skb, struct nlmsghdr *n, void *arg) 
		return -EINVAL;

	}



	/* n->nlmsg_flags&NLM_F_CREATE

	 * */

	/* n->nlmsg_flags & NLM_F_CREATE */

	switch (n->nlmsg_type) {

	case RTM_NEWACTION:

		/* we are going to assume all other flags
@@ -1071,9 +1072,8 @@ tc_dump_action(struct sk_buff *skb, struct netlink_callback *cb) 
	}



	a_o = tc_lookup_action(kind);

	if (a_o == NULL) {

	if (a_o == NULL)

		return 0;

	}



	memset(&a, 0, sizeof(struct tc_action));

	a.ops = a_o;

net/sched/act_gact.c

+4 −4
Original line number Diff line number Diff line
@@ -205,9 +205,9 @@ MODULE_LICENSE("GPL"); 
static int __init gact_init_module(void)

{

#ifdef CONFIG_GACT_PROB

	printk(KERN_INFO "GACT probability on\n");

	pr_info("GACT probability on\n");

#else

	printk(KERN_INFO "GACT probability NOT on\n");

	pr_info("GACT probability NOT on\n");

#endif

	return tcf_register_action(&act_gact_ops);

}

net/sched/act_ipt.c

+9 −7
Original line number Diff line number Diff line
@@ -162,7 +162,8 @@ static int tcf_ipt_init(struct nlattr *nla, struct nlattr *est, 
	if (unlikely(!t))

		goto err2;



	if ((err = ipt_init_target(t, tname, hook)) < 0)

	err = ipt_init_target(t, tname, hook);

	if (err < 0)

		goto err3;



	spin_lock_bh(&ipt->tcf_lock);
@@ -212,8 +213,9 @@ static int tcf_ipt(struct sk_buff *skb, struct tc_action *a, 
	bstats_update(&ipt->tcf_bstats, skb);



	/* yes, we have to worry about both in and out dev

	 worry later - danger - this API seems to have changed

	 from earlier kernels */

	 * worry later - danger - this API seems to have changed

	 * from earlier kernels

	 */

	par.in       = skb->dev;

	par.out      = NULL;

	par.hooknum  = ipt->tcfi_hook;
@@ -253,8 +255,8 @@ static int tcf_ipt_dump(struct sk_buff *skb, struct tc_action *a, int bind, int 
	struct tc_cnt c;



	/* for simple targets kernel size == user size

	** user name = target name

	** for foolproof you need to not assume this

	 * user name = target name

	 * for foolproof you need to not assume this

	 */



	t = kmemdup(ipt->tcfi_t, ipt->tcfi_t->u.user.target_size, GFP_ATOMIC);

net/sched/act_mirred.c

+2 −2
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ static struct tcf_hashinfo mirred_hash_info = { 
	.lock	=	&mirred_lock,

};



static inline int tcf_mirred_release(struct tcf_mirred *m, int bind)

static int tcf_mirred_release(struct tcf_mirred *m, int bind)

{

	if (m) {

		if (bind)

net/sched/act_pedit.c

+4 −6
Original line number Diff line number Diff line
@@ -127,11 +127,9 @@ static int tcf_pedit(struct sk_buff *skb, struct tc_action *a, 
	int i, munged = 0;

	unsigned int off;



	if (skb_cloned(skb)) {

		if (pskb_expand_head(skb, 0, 0, GFP_ATOMIC)) {

	if (skb_cloned(skb) &&

	    pskb_expand_head(skb, 0, 0, GFP_ATOMIC))

		return p->tcf_action;

		}

	}



	off = skb_network_offset(skb);