Re: [PATCH net-next v2 5/6] net: dsa: remove out_drop label in taggers rcv

[Florian Fainelli]

On 05/30/2017 11:33 AM, Vivien Didelot wrote:
> Many rcv functions from net/dsa/tag_*.c have a useless out_drop goto
> label which simply returns NULL. Kill it in favor of the obvious.

Why not

> 
> Signed-off-by: Vivien Didelot 

Reviewed-by: Florian Fainelli 
-- 
Florian

Re: [PATCH net-next v2 5/6] net: dsa: remove out_drop label in taggers rcv

[Florian Fainelli]

On 05/30/2017 11:33 AM, Vivien Didelot wrote:
> Many rcv functions from net/dsa/tag_*.c have a useless out_drop goto
> label which simply returns NULL. Kill it in favor of the obvious.

Why not

> 
> Signed-off-by: Vivien Didelot 

Reviewed-by: Florian Fainelli 
-- 
Florian

[PATCH net-next v2 5/6] net: dsa: remove out_drop label in taggers rcv

[Vivien Didelot]

Many rcv functions from net/dsa/tag_*.c have a useless out_drop goto
label which simply returns NULL. Kill it in favor of the obvious.

Signed-off-by: Vivien Didelot 
---
 net/dsa/tag_brcm.c| 11 ---
 net/dsa/tag_dsa.c | 13 +
 net/dsa/tag_edsa.c| 13 +
 net/dsa/tag_mtk.c |  9 +++--
 net/dsa/tag_qca.c | 11 ---
 net/dsa/tag_trailer.c |  9 +++--
 6 files changed, 24 insertions(+), 42 deletions(-)

diff --git a/net/dsa/tag_brcm.c b/net/dsa/tag_brcm.c
index c8bff4d7543d..10fa4c0ca46b 100644
--- a/net/dsa/tag_brcm.c
+++ b/net/dsa/tag_brcm.c
@@ -102,27 +102,27 @@ static struct sk_buff *brcm_tag_rcv(struct sk_buff *skb, 
struct net_device *dev)
ds = dst->cpu_dp->ds;
 
if (unlikely(!pskb_may_pull(skb, BRCM_TAG_LEN)))
-   goto out_drop;
+   return NULL;
 
/* skb->data points to the EtherType, the tag is right before it */
brcm_tag = skb->data - 2;
 
/* The opcode should never be different than 0b000 */
if (unlikely((brcm_tag[0] >> BRCM_OPCODE_SHIFT) & BRCM_OPCODE_MASK))
-   goto out_drop;
+   return NULL;
 
/* We should never see a reserved reason code without knowing how to
 * handle it
 */
if (unlikely(brcm_tag[2] & BRCM_EG_RC_RSVD))
-   goto out_drop;
+   return NULL;
 
/* Locate which port this is coming from */
source_port = brcm_tag[3] & BRCM_EG_PID_MASK;
 
/* Validate port against switch setup, either the port is totally */
if (source_port >= ds->num_ports || !ds->ports[source_port].netdev)
-   goto out_drop;
+   return NULL;
 
/* Remove Broadcom tag and update checksum */
skb_pull_rcsum(skb, BRCM_TAG_LEN);
@@ -135,9 +135,6 @@ static struct sk_buff *brcm_tag_rcv(struct sk_buff *skb, 
struct net_device *dev)
skb->dev = ds->ports[source_port].netdev;
 
return skb;
-
-out_drop:
-   return NULL;
 }
 
 const struct dsa_device_ops brcm_netdev_ops = {
diff --git a/net/dsa/tag_dsa.c b/net/dsa/tag_dsa.c
index 41f78e42f9ba..9f5fecaa4a93 100644
--- a/net/dsa/tag_dsa.c
+++ b/net/dsa/tag_dsa.c
@@ -77,7 +77,7 @@ static struct sk_buff *dsa_rcv(struct sk_buff *skb, struct 
net_device *dev)
int source_port;
 
if (unlikely(!pskb_may_pull(skb, DSA_HLEN)))
-   goto out_drop;
+   return NULL;
 
/*
 * The ethertype field is part of the DSA header.
@@ -88,7 +88,7 @@ static struct sk_buff *dsa_rcv(struct sk_buff *skb, struct 
net_device *dev)
 * Check that frame type is either TO_CPU or FORWARD.
 */
if ((dsa_header[0] & 0xc0) != 0x00 && (dsa_header[0] & 0xc0) != 0xc0)
-   goto out_drop;
+   return NULL;
 
/*
 * Determine source device and port.
@@ -101,14 +101,14 @@ static struct sk_buff *dsa_rcv(struct sk_buff *skb, 
struct net_device *dev)
 * port is a registered DSA port.
 */
if (source_device >= DSA_MAX_SWITCHES)
-   goto out_drop;
+   return NULL;
 
ds = dst->ds[source_device];
if (!ds)
-   goto out_drop;
+   return NULL;
 
if (source_port >= ds->num_ports || !ds->ports[source_port].netdev)
-   goto out_drop;
+   return NULL;
 
/*
 * Convert the DSA header to an 802.1q header if the 'tagged'
@@ -159,9 +159,6 @@ static struct sk_buff *dsa_rcv(struct sk_buff *skb, struct 
net_device *dev)
skb->dev = ds->ports[source_port].netdev;
 
return skb;
-
-out_drop:
-   return NULL;
 }
 
 const struct dsa_device_ops dsa_netdev_ops = {
diff --git a/net/dsa/tag_edsa.c b/net/dsa/tag_edsa.c
index 36389fc8fe06..a9a06e19abeb 100644
--- a/net/dsa/tag_edsa.c
+++ b/net/dsa/tag_edsa.c
@@ -90,7 +90,7 @@ static struct sk_buff *edsa_rcv(struct sk_buff *skb, struct 
net_device *dev)
int source_port;
 
if (unlikely(!pskb_may_pull(skb, EDSA_HLEN)))
-   goto out_drop;
+   return NULL;
 
/*
 * Skip the two null bytes after the ethertype.
@@ -101,7 +101,7 @@ static struct sk_buff *edsa_rcv(struct sk_buff *skb, struct 
net_device *dev)
 * Check that frame type is either TO_CPU or FORWARD.
 */
if ((edsa_header[0] & 0xc0) != 0x00 && (edsa_header[0] & 0xc0) != 0xc0)
-   goto out_drop;
+   return NULL;
 
/*
 * Determine source device and port.
@@ -114,14 +114,14 @@ static struct sk_buff *edsa_rcv(struct sk_buff *skb, 
struct net_device *dev)
 * port is a registered DSA port.
 */
if (source_device >= DSA_MAX_SWITCHES)
-   goto out_drop;
+   return NULL;
 
ds = dst->ds[source_device];
if (!ds)
-   goto out_drop;
+   return NULL;
 
if 

[PATCH net-next v2 5/6] net: dsa: remove out_drop label in taggers rcv

[Vivien Didelot]

Many rcv functions from net/dsa/tag_*.c have a useless out_drop goto
label which simply returns NULL. Kill it in favor of the obvious.

Signed-off-by: Vivien Didelot 
---
 net/dsa/tag_brcm.c| 11 ---
 net/dsa/tag_dsa.c | 13 +
 net/dsa/tag_edsa.c| 13 +
 net/dsa/tag_mtk.c |  9 +++--
 net/dsa/tag_qca.c | 11 ---
 net/dsa/tag_trailer.c |  9 +++--
 6 files changed, 24 insertions(+), 42 deletions(-)

diff --git a/net/dsa/tag_brcm.c b/net/dsa/tag_brcm.c
index c8bff4d7543d..10fa4c0ca46b 100644
--- a/net/dsa/tag_brcm.c
+++ b/net/dsa/tag_brcm.c
@@ -102,27 +102,27 @@ static struct sk_buff *brcm_tag_rcv(struct sk_buff *skb, 
struct net_device *dev)
ds = dst->cpu_dp->ds;
 
if (unlikely(!pskb_may_pull(skb, BRCM_TAG_LEN)))
-   goto out_drop;
+   return NULL;
 
/* skb->data points to the EtherType, the tag is right before it */
brcm_tag = skb->data - 2;
 
/* The opcode should never be different than 0b000 */
if (unlikely((brcm_tag[0] >> BRCM_OPCODE_SHIFT) & BRCM_OPCODE_MASK))
-   goto out_drop;
+   return NULL;
 
/* We should never see a reserved reason code without knowing how to
 * handle it
 */
if (unlikely(brcm_tag[2] & BRCM_EG_RC_RSVD))
-   goto out_drop;
+   return NULL;
 
/* Locate which port this is coming from */
source_port = brcm_tag[3] & BRCM_EG_PID_MASK;
 
/* Validate port against switch setup, either the port is totally */
if (source_port >= ds->num_ports || !ds->ports[source_port].netdev)
-   goto out_drop;
+   return NULL;
 
/* Remove Broadcom tag and update checksum */
skb_pull_rcsum(skb, BRCM_TAG_LEN);
@@ -135,9 +135,6 @@ static struct sk_buff *brcm_tag_rcv(struct sk_buff *skb, 
struct net_device *dev)
skb->dev = ds->ports[source_port].netdev;
 
return skb;
-
-out_drop:
-   return NULL;
 }
 
 const struct dsa_device_ops brcm_netdev_ops = {
diff --git a/net/dsa/tag_dsa.c b/net/dsa/tag_dsa.c
index 41f78e42f9ba..9f5fecaa4a93 100644
--- a/net/dsa/tag_dsa.c
+++ b/net/dsa/tag_dsa.c
@@ -77,7 +77,7 @@ static struct sk_buff *dsa_rcv(struct sk_buff *skb, struct 
net_device *dev)
int source_port;
 
if (unlikely(!pskb_may_pull(skb, DSA_HLEN)))
-   goto out_drop;
+   return NULL;
 
/*
 * The ethertype field is part of the DSA header.
@@ -88,7 +88,7 @@ static struct sk_buff *dsa_rcv(struct sk_buff *skb, struct 
net_device *dev)
 * Check that frame type is either TO_CPU or FORWARD.
 */
if ((dsa_header[0] & 0xc0) != 0x00 && (dsa_header[0] & 0xc0) != 0xc0)
-   goto out_drop;
+   return NULL;
 
/*
 * Determine source device and port.
@@ -101,14 +101,14 @@ static struct sk_buff *dsa_rcv(struct sk_buff *skb, 
struct net_device *dev)
 * port is a registered DSA port.
 */
if (source_device >= DSA_MAX_SWITCHES)
-   goto out_drop;
+   return NULL;
 
ds = dst->ds[source_device];
if (!ds)
-   goto out_drop;
+   return NULL;
 
if (source_port >= ds->num_ports || !ds->ports[source_port].netdev)
-   goto out_drop;
+   return NULL;
 
/*
 * Convert the DSA header to an 802.1q header if the 'tagged'
@@ -159,9 +159,6 @@ static struct sk_buff *dsa_rcv(struct sk_buff *skb, struct 
net_device *dev)
skb->dev = ds->ports[source_port].netdev;
 
return skb;
-
-out_drop:
-   return NULL;
 }
 
 const struct dsa_device_ops dsa_netdev_ops = {
diff --git a/net/dsa/tag_edsa.c b/net/dsa/tag_edsa.c
index 36389fc8fe06..a9a06e19abeb 100644
--- a/net/dsa/tag_edsa.c
+++ b/net/dsa/tag_edsa.c
@@ -90,7 +90,7 @@ static struct sk_buff *edsa_rcv(struct sk_buff *skb, struct 
net_device *dev)
int source_port;
 
if (unlikely(!pskb_may_pull(skb, EDSA_HLEN)))
-   goto out_drop;
+   return NULL;
 
/*
 * Skip the two null bytes after the ethertype.
@@ -101,7 +101,7 @@ static struct sk_buff *edsa_rcv(struct sk_buff *skb, struct 
net_device *dev)
 * Check that frame type is either TO_CPU or FORWARD.
 */
if ((edsa_header[0] & 0xc0) != 0x00 && (edsa_header[0] & 0xc0) != 0xc0)
-   goto out_drop;
+   return NULL;
 
/*
 * Determine source device and port.
@@ -114,14 +114,14 @@ static struct sk_buff *edsa_rcv(struct sk_buff *skb, 
struct net_device *dev)
 * port is a registered DSA port.
 */
if (source_device >= DSA_MAX_SWITCHES)
-   goto out_drop;
+   return NULL;
 
ds = dst->ds[source_device];
if (!ds)
-   goto out_drop;
+   return NULL;
 
if (source_port >= ds->num_ports ||