diff options
| author | Shmulik Ladkani <shmulik.ladkani@gmail.com> | 2016-10-13 08:06:42 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-10-14 16:23:06 +0200 |
| commit | dcf800344a91173802f2ad9c1c6b642f4b302df6 (patch) | |
| tree | b49a643c29af9647db060d4c0bb2ddbfe7ea1861 /net/sched/act_mirred.c | |
| parent | net/sched: act_mirred: Rename tcfm_ok_push to tcfm_mac_header_xmit and make i... (diff) | |
| download | linux-dcf800344a91173802f2ad9c1c6b642f4b302df6.tar.xz linux-dcf800344a91173802f2ad9c1c6b642f4b302df6.zip | |
net/sched: act_mirred: Refactor detection whether dev needs xmit at mac header
Move detection logic that tests whether device expects skb data to point
at mac_header upon xmit into a function.
Signed-off-by: Shmulik Ladkani <shmulik.ladkani@gmail.com>
Acked-by: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/act_mirred.c')
| -rw-r--r-- | net/sched/act_mirred.c | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/net/sched/act_mirred.c b/net/sched/act_mirred.c index 16e17a887bd6..69dcce8c7532 100644 --- a/net/sched/act_mirred.c +++ b/net/sched/act_mirred.c @@ -54,6 +54,20 @@ static const struct nla_policy mirred_policy[TCA_MIRRED_MAX + 1] = { static int mirred_net_id; static struct tc_action_ops act_mirred_ops; +static bool dev_is_mac_header_xmit(const struct net_device *dev) +{ + switch (dev->type) { + case ARPHRD_TUNNEL: + case ARPHRD_TUNNEL6: + case ARPHRD_SIT: + case ARPHRD_IPGRE: + case ARPHRD_VOID: + case ARPHRD_NONE: + return false; + } + return true; +} + static int tcf_mirred_init(struct net *net, struct nlattr *nla, struct nlattr *est, struct tc_action **a, int ovr, int bind) @@ -96,19 +110,7 @@ static int tcf_mirred_init(struct net *net, struct nlattr *nla, tcf_hash_release(*a, bind); return -ENODEV; } - switch (dev->type) { - case ARPHRD_TUNNEL: - case ARPHRD_TUNNEL6: - case ARPHRD_SIT: - case ARPHRD_IPGRE: - case ARPHRD_VOID: - case ARPHRD_NONE: - mac_header_xmit = false; - break; - default: - mac_header_xmit = true; - break; - } + mac_header_xmit = dev_is_mac_header_xmit(dev); } else { dev = NULL; } |