Merge tag 'iommu-updates-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git...

[cascardo/linux.git] / net / mac802154 / wpan.c

diff --git a/net/mac802154/wpan.c b/net/mac802154/wpan.c
index d593500..4ab86a5 100644 (file)
--- a/net/mac802154/wpan.c
+++ b/net/mac802154/wpan.c
@@ -475,8 +475,7 @@ mac802154_subif_frame(struct mac802154_sub_if_data *sdata, struct sk_buff *skb,
        rc = mac802154_llsec_decrypt(&sdata->sec, skb);
        if (rc) {
                pr_debug("decryption failed: %i\n", rc);
-               kfree_skb(skb);
-               return NET_RX_DROP;
+               goto fail;
        }
 
        sdata->dev->stats.rx_packets++;
@@ -488,9 +487,12 @@ mac802154_subif_frame(struct mac802154_sub_if_data *sdata, struct sk_buff *skb,
        default:
                pr_warn("ieee802154: bad frame received (type = %d)\n",
                        mac_cb(skb)->type);
-               kfree_skb(skb);
-               return NET_RX_DROP;
+               goto fail;
        }
+
+fail:
+       kfree_skb(skb);
+       return NET_RX_DROP;
 }
 
 static void mac802154_print_addr(const char *name,