net: dsa: make the .flow_dissect tagger callback return void

There is no tagger that returns anything other than zero, so just change
the return type appropriately.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/dsa.h b/include/net/dsa.h
index 46019ed..98d3393 100644 (file)
--- a/include/net/dsa.h
+++ b/include/net/dsa.h
@@ -74,8 +74,8 @@ struct dsa_device_ops {
        struct sk_buff *(*xmit)(struct sk_buff *skb, struct net_device *dev);
        struct sk_buff *(*rcv)(struct sk_buff *skb, struct net_device *dev,
                               struct packet_type *pt);
-       int (*flow_dissect)(const struct sk_buff *skb, __be16 *proto,
-                           int *offset);
+       void (*flow_dissect)(const struct sk_buff *skb, __be16 *proto,
+                            int *offset);
        /* Used to determine which traffic should match the DSA filter in
         * eth_type_trans, and which, if any, should bypass it and be processed
         * as regular on the master net device.

diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c
index 29806eb..13cc4c0 100644 (file)
--- a/net/core/flow_dissector.c
+++ b/net/core/flow_dissector.c
@@ -932,8 +932,8 @@ bool __skb_flow_dissect(const struct net *net,
                        int offset = 0;
 
                        ops = skb->dev->dsa_ptr->tag_ops;
-                       if (ops->flow_dissect &&
-                           !ops->flow_dissect(skb, &proto, &offset)) {
+                       if (ops->flow_dissect) {
+                               ops->flow_dissect(skb, &proto, &offset);
                                hlen -= offset;
                                nhoff += offset;
                        }

diff --git a/net/dsa/tag_brcm.c b/net/dsa/tag_brcm.c
index 1dab212..610bc74 100644 (file)
--- a/net/dsa/tag_brcm.c
+++ b/net/dsa/tag_brcm.c
@@ -150,8 +150,8 @@ static struct sk_buff *brcm_tag_rcv_ll(struct sk_buff *skb,
        return skb;
 }
 
-static int brcm_tag_flow_dissect(const struct sk_buff *skb, __be16 *proto,
-                                int *offset)
+static void brcm_tag_flow_dissect(const struct sk_buff *skb, __be16 *proto,
+                                 int *offset)
 {
        /* We have been called on the DSA master network device after
         * eth_type_trans() which pulled the Ethernet header already.
@@ -168,7 +168,6 @@ static int brcm_tag_flow_dissect(const struct sk_buff *skb, __be16 *proto,
         */
        *offset = BRCM_TAG_LEN;
        *proto = ((__be16 *)skb->data)[1];
-       return 0;
 }
 #endif
 

diff --git a/net/dsa/tag_dsa.c b/net/dsa/tag_dsa.c
index 7ddec97..ef15aee 100644 (file)
--- a/net/dsa/tag_dsa.c
+++ b/net/dsa/tag_dsa.c
@@ -142,12 +142,11 @@ static struct sk_buff *dsa_rcv(struct sk_buff *skb, struct net_device *dev,
        return skb;
 }
 
-static int dsa_tag_flow_dissect(const struct sk_buff *skb, __be16 *proto,
-                               int *offset)
+static void dsa_tag_flow_dissect(const struct sk_buff *skb, __be16 *proto,
+                                int *offset)
 {
        *offset = 4;
        *proto = ((__be16 *)skb->data)[1];
-       return 0;
 }
 
 static const struct dsa_device_ops dsa_netdev_ops = {

diff --git a/net/dsa/tag_edsa.c b/net/dsa/tag_edsa.c
index d6200ff..275e7d9 100644 (file)
--- a/net/dsa/tag_edsa.c
+++ b/net/dsa/tag_edsa.c
@@ -192,12 +192,11 @@ static struct sk_buff *edsa_rcv(struct sk_buff *skb, struct net_device *dev,
        return skb;
 }
 
-static int edsa_tag_flow_dissect(const struct sk_buff *skb, __be16 *proto,
-                                int *offset)
+static void edsa_tag_flow_dissect(const struct sk_buff *skb, __be16 *proto,
+                                 int *offset)
 {
        *offset = 8;
        *proto = ((__be16 *)skb->data)[3];
-       return 0;
 }
 
 static const struct dsa_device_ops edsa_netdev_ops = {

diff --git a/net/dsa/tag_mtk.c b/net/dsa/tag_mtk.c
index f602fc7..2aba17b 100644 (file)
--- a/net/dsa/tag_mtk.c
+++ b/net/dsa/tag_mtk.c
@@ -105,13 +105,11 @@ static struct sk_buff *mtk_tag_rcv(struct sk_buff *skb, struct net_device *dev,
        return skb;
 }
 
-static int mtk_tag_flow_dissect(const struct sk_buff *skb, __be16 *proto,
-                               int *offset)
+static void mtk_tag_flow_dissect(const struct sk_buff *skb, __be16 *proto,
+                                int *offset)
 {
        *offset = 4;
        *proto = ((__be16 *)skb->data)[1];
-
-       return 0;
 }
 
 static const struct dsa_device_ops mtk_netdev_ops = {

diff --git a/net/dsa/tag_qca.c b/net/dsa/tag_qca.c
index 7066f5e..a75c6b2 100644 (file)
--- a/net/dsa/tag_qca.c
+++ b/net/dsa/tag_qca.c
@@ -89,13 +89,11 @@ static struct sk_buff *qca_tag_rcv(struct sk_buff *skb, struct net_device *dev,
        return skb;
 }
 
-static int qca_tag_flow_dissect(const struct sk_buff *skb, __be16 *proto,
-                                int *offset)
+static void qca_tag_flow_dissect(const struct sk_buff *skb, __be16 *proto,
+                                int *offset)
 {
        *offset = QCA_HDR_LEN;
        *proto = ((__be16 *)skb->data)[0];
-
-       return 0;
 }
 
 static const struct dsa_device_ops qca_netdev_ops = {

diff --git a/net/dsa/tag_rtl4_a.c b/net/dsa/tag_rtl4_a.c
index 7b63010..868980b 100644 (file)
--- a/net/dsa/tag_rtl4_a.c
+++ b/net/dsa/tag_rtl4_a.c
@@ -106,14 +106,12 @@ static struct sk_buff *rtl4a_tag_rcv(struct sk_buff *skb,
        return skb;
 }
 
-static int rtl4a_tag_flow_dissect(const struct sk_buff *skb, __be16 *proto,
-                                 int *offset)
+static void rtl4a_tag_flow_dissect(const struct sk_buff *skb, __be16 *proto,
+                                  int *offset)
 {
        *offset = RTL4_A_HDR_LEN;
        /* Skip past the tag and fetch the encapsulated Ethertype */
        *proto = ((__be16 *)skb->data)[1];
-
-       return 0;
 }
 
 static const struct dsa_device_ops rtl4a_netdev_ops = {