path: root/net/mac802154/rx.c
diff options
authorPhoebe Buckheister <phoebe.buckheister@itwm.fraunhofer.de>2014-06-11 12:03:07 +0200
committerDavid S. Miller <davem@davemloft.net>2014-06-11 12:10:19 -0700
commit2d3b5b0a90e5370ad13ca98d95519c3e41d2c925 (patch)
treebad4e444da804759fe1d8f91d4a940cdcb4ca1fb /net/mac802154/rx.c
parenta374eeb5e5b35c877a890dce5d3f7cca5a3e33f6 (diff)
mac802154: don't deliver packets to devices that are down
Only one WPAN devices can be active at any given time, so only deliver packets to that one interface that is actually up. Multiple monitors may be up at any given time, but we don't have to deliver to monitors that are down either. Signed-off-by: Phoebe Buckheister <phoebe.buckheister@itwm.fraunhofer.de> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac802154/rx.c')
1 files changed, 7 insertions, 4 deletions
diff --git a/net/mac802154/rx.c b/net/mac802154/rx.c
index 0597b96dc9ba..7f820a108a9c 100644
--- a/net/mac802154/rx.c
+++ b/net/mac802154/rx.c
@@ -64,20 +64,23 @@ mac802154_subif_rx(struct ieee802154_dev *hw, struct sk_buff *skb, u8 lqi)
if (skb->len < 2) {
pr_debug("got invalid frame\n");
- goto out;
+ goto fail;
crc = crc_ccitt(0, skb->data, skb->len);
if (crc) {
pr_debug("CRC mismatch\n");
- goto out;
+ goto fail;
skb_trim(skb, skb->len - 2); /* CRC */
mac802154_monitors_rx(priv, skb);
mac802154_wpans_rx(priv, skb);
- dev_kfree_skb(skb);
+ return;
+ kfree_skb(skb);
static void mac802154_rx_worker(struct work_struct *work)