[PATCH net-next 2/4] net/sched: act_mirred: Refactor detection whether dev needs xmit at mac header

[Shmulik Ladkani]

From: Shmulik Ladkani <shmulik.ladk...@gmail.com>

Move detection logic that tests whether device expects skb data to point
to mac_header upon xmit into a function.

Signed-off-by: Shmulik Ladkani <shmulik.ladk...@gmail.com>
---
 net/sched/act_mirred.c | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/net/sched/act_mirred.c b/net/sched/act_mirred.c
index 7b03b13..28629d3 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 int 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 0;
+       }
+       return 1;
+}
+
 static int tcf_mirred_init(struct net *net, struct nlattr *nla,
                           struct nlattr *est, struct tc_action **a, int ovr,
                           int bind)
@@ -95,19 +109,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 = 0;
-                       break;
-               default:
-                       mac_header_xmit = 1;
-                       break;
-               }
+               mac_header_xmit = dev_is_mac_header_xmit(dev);
        } else {
                dev = NULL;
        }
-- 
1.9.1