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>

diff --git a/net/sched/act_mirred.c b/net/sched/act_mirred.c
index 16e17a887bd62877d990dbe1e59e4c548e800969..69dcce8c7532e0a7b48b836991aa0417e5d9ff3a 100644 (file)
--- 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;
        }