Commit b76965e0 authored by Changli Gao's avatar Changli Gao Committed by David S. Miller
Browse files

act_mirred: optimization. 



move checking if eaction is valid in tcf_mirred_init()

Signed-off-by: default avatarChangli Gao <xiaosuo@gmail.com>
Signed-off-by: default avatarJamal Hadi Salim <hadi@cyberus.ca>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent feed1f17

net/sched/act_mirred.c

+29 −31
Original line number Diff line number Diff line
@@ -65,21 +65,24 @@ static int tcf_mirred_init(struct nlattr *nla, struct nlattr *est, 
	struct tc_mirred *parm;

	struct tcf_mirred *m;

	struct tcf_common *pc;

	struct net_device *dev = NULL;

	int ret = 0, err;

	int ok_push = 0;

	struct net_device *dev;

	int ret, ok_push = 0;



	if (nla == NULL)

		return -EINVAL;



	err = nla_parse_nested(tb, TCA_MIRRED_MAX, nla, mirred_policy);

	if (err < 0)

		return err;



	ret = nla_parse_nested(tb, TCA_MIRRED_MAX, nla, mirred_policy);

	if (ret < 0)

		return ret;

	if (tb[TCA_MIRRED_PARMS] == NULL)

		return -EINVAL;

	parm = nla_data(tb[TCA_MIRRED_PARMS]);



	switch (parm->eaction) {

	case TCA_EGRESS_MIRROR:

	case TCA_EGRESS_REDIR:

		break;

	default:

		return -EINVAL;

	}

	if (parm->ifindex) {

		dev = __dev_get_by_index(&init_net, parm->ifindex);

		if (dev == NULL)
@@ -97,11 +100,13 @@ static int tcf_mirred_init(struct nlattr *nla, struct nlattr *est, 
			ok_push = 1;

			break;

		}

	} else {

		dev = NULL;

	}



	pc = tcf_hash_check(parm->index, a, bind, &mirred_hash_info);

	if (!pc) {

		if (!parm->ifindex)

		if (dev == NULL)

			return -EINVAL;

		pc = tcf_hash_create(parm->index, est, a, sizeof(*m), bind,

				     &mirred_idx_gen, &mirred_hash_info);
@@ -119,12 +124,12 @@ static int tcf_mirred_init(struct nlattr *nla, struct nlattr *est, 
	spin_lock_bh(&m->tcf_lock);

	m->tcf_action = parm->action;

	m->tcfm_eaction = parm->eaction;

	if (parm->ifindex) {

	if (dev != NULL) {

		m->tcfm_ifindex = parm->ifindex;

		if (ret != ACT_P_CREATED)

			dev_put(m->tcfm_dev);

		m->tcfm_dev = dev;

		dev_hold(dev);

		m->tcfm_dev = dev;

		m->tcfm_ok_push = ok_push;

	}

	spin_unlock_bh(&m->tcf_lock);
@@ -154,13 +159,6 @@ static int tcf_mirred(struct sk_buff *skb, struct tc_action *a, 


	spin_lock(&m->tcf_lock);

	m->tcf_tm.lastuse = jiffies;

	if (m->tcfm_eaction != TCA_EGRESS_MIRROR &&

	    m->tcfm_eaction != TCA_EGRESS_REDIR) {

		if (net_ratelimit())

			printk("tcf_mirred unknown action %d\n",

			       m->tcfm_eaction);

		goto out;

	}



	dev = m->tcfm_dev;

	if (!(dev->flags & IFF_UP)) {