3 files changed, 16 insertions, 14 deletions

diff --git a/net/mac802154/rx.c b/net/mac802154/rx.c
index 7f820a108a9c..a14cf9ede171 100644
--- a/net/mac802154/rx.c
+++ b/net/mac802154/rx.c
@@ -86,9 +86,8 @@ fail:
 static void mac802154_rx_worker(struct work_struct *work)
 {
         struct rx_work *rw = container_of(work, struct rx_work, work);
-        struct sk_buff *skb = rw->skb;
 
-        mac802154_subif_rx(rw->dev, skb, rw->lqi);
+        mac802154_subif_rx(rw->dev, rw->skb, rw->lqi);
         kfree(rw);
 }
 
@@ -101,7 +100,7 @@ ieee802154_rx_irqsafe(struct ieee802154_dev *dev, struct sk_buff *skb, u8 lqi)
         if (!skb)
                 return;
 
-        work = kzalloc(sizeof(struct rx_work), GFP_ATOMIC);
+        work = kzalloc(sizeof(*work), GFP_ATOMIC);
         if (!work)
                 return;
 
diff --git a/net/mac802154/tx.c b/net/mac802154/tx.c
index 8124353646ae..fdf4c0e67259 100644
--- a/net/mac802154/tx.c
+++ b/net/mac802154/tx.c
@@ -89,8 +89,7 @@ netdev_tx_t mac802154_tx(struct mac802154_priv *priv, struct sk_buff *skb,
 
         if (!(priv->phy->channels_supported[page] & (1 << chan))) {
                 WARN_ON(1);
-                kfree_skb(skb);
-                return NETDEV_TX_OK;
+                goto err_tx;
         }
 
         mac802154_monitors_rx(mac802154_to_priv(&priv->hw), skb);
@@ -103,12 +102,10 @@ netdev_tx_t mac802154_tx(struct mac802154_priv *priv, struct sk_buff *skb,
                 data[1] = crc >> 8;
         }
 
-        if (skb_cow_head(skb, priv->hw.extra_tx_headroom)) {
-                kfree_skb(skb);
-                return NETDEV_TX_OK;
-        }
+        if (skb_cow_head(skb, priv->hw.extra_tx_headroom))
+                goto err_tx;
 
-        work = kzalloc(sizeof(struct xmit_work), GFP_ATOMIC);
+        work = kzalloc(sizeof(*work), GFP_ATOMIC);
         if (!work) {
                 kfree_skb(skb);
                 return NETDEV_TX_BUSY;
@@ -129,4 +126,8 @@ netdev_tx_t mac802154_tx(struct mac802154_priv *priv, struct sk_buff *skb,
         queue_work(priv->dev_workqueue, &work->work);
 
         return NETDEV_TX_OK;
+
+err_tx:
+        kfree_skb(skb);
+        return NETDEV_TX_OK;
 }
diff --git a/net/mac802154/wpan.c b/net/mac802154/wpan.c
index d593500ceb3c..4ab86a57dca5 100644
--- 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,