net: dsa: remove out_drop label in taggers rcv

[linux-2.6-block.git] / net / dsa / tag_qca.c

diff --git a/net/dsa/tag_qca.c b/net/dsa/tag_qca.c
index 2451007699b73721415301ef19aff4985d5b58fe..44f545d2761aae042239af092399308ba1c188d7 100644 (file)
--- a/net/dsa/tag_qca.c
+++ b/net/dsa/tag_qca.c
@@ -77,7 +77,7 @@ static struct sk_buff *qca_tag_rcv(struct sk_buff *skb, struct net_device *dev,
        __be16 *phdr, hdr;
 
        if (unlikely(!pskb_may_pull(skb, QCA_HDR_LEN)))
-               goto out_drop;
+               return NULL;
 
        /* The QCA header is added by the switch between src addr and Ethertype
         * At this point, skb->data points to ethertype so header should be
@@ -89,7 +89,7 @@ static struct sk_buff *qca_tag_rcv(struct sk_buff *skb, struct net_device *dev,
        /* Make sure the version is correct */
        ver = (hdr & QCA_HDR_RECV_VERSION_MASK) >> QCA_HDR_RECV_VERSION_S;
        if (unlikely(ver != QCA_HDR_VERSION))
-               goto out_drop;
+               return NULL;
 
        /* Remove QCA tag and recalculate checksum */
        skb_pull_rcsum(skb, QCA_HDR_LEN);
@@ -101,20 +101,17 @@ static struct sk_buff *qca_tag_rcv(struct sk_buff *skb, struct net_device *dev,
         */
        ds = dst->cpu_dp->ds;
        if (!ds)
-               goto out_drop;
+               return NULL;
 
        /* Get source port information */
        port = (hdr & QCA_HDR_RECV_SOURCE_PORT_MASK);
        if (!ds->ports[port].netdev)
-               goto out_drop;
+               return NULL;
 
        /* Update skb & forward the frame accordingly */
        skb->dev = ds->ports[port].netdev;
 
        return skb;
-
-out_drop:
-       return NULL;
 }
 
 const struct dsa_device_ops qca_netdev_ops = {