diff options
| author |   Vivien Didelot <vivien.didelot@savoirfairelinux.com> | 2017-06-01 16:07:14 -0400 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-06-01 17:34:56 -0400 |
| commit | 5470979585d81271d4338c2accfd5e71dafa4af6 (patch) | |
| tree | 44732fbb5e9b8b1d28f935f8e0eba01762640f2f /net/dsa/tag_edsa.c | |
| parent | net: dsa: remove dsa_uses_tagged_protocol (diff) | |
| download | linux-dev-5470979585d81271d4338c2accfd5e71dafa4af6.tar.xz linux-dev-5470979585d81271d4338c2accfd5e71dafa4af6.zip | |
net: dsa: remove out_drop label in taggers rcv
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.
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dsa/tag_edsa.c')
| -rw-r--r-- | net/dsa/tag_edsa.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/net/dsa/tag_edsa.c b/net/dsa/tag_edsa.c index f95cafd05702..a7eed1d43d80 100644 --- a/net/dsa/tag_edsa.c +++ b/net/dsa/tag_edsa.c @@ -92,7 +92,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. @@ -103,7 +103,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. @@ -116,14 +116,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 || !ds->ports[source_port].netdev) - goto out_drop; + return NULL; /* * If the 'tagged' bit is set, convert the DSA tag to a 802.1q @@ -180,9 +180,6 @@ static struct sk_buff *edsa_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 edsa_netdev_ops = { |