From: David S. Miller <davem@davemloft.net>
Date: Wed, 11 Jun 2014 19:11:25 +0000 (-0700)
Subject: Merge branch 'mac802154'
X-Git-Tag: v3.16-rc1~27^2~36
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=9181a6bd18009bf417bc865fd862075c335cc1dd;p=~emulex%2Finfiniband.git

Merge branch 'mac802154'

Phoebe Buckheister says:

====================
Recent llsec code introduced a memory leak on decryption failures during rx.
This fixes said leak, and optimizes the receive loops for monitor and wpan
devices to only deliver skbs to devices that are actually up. Also changes a
dev_kfree_skb to kfree_skb when an invalid packet is dropped before being
pushed into the stack.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

9181a6bd18009bf417bc865fd862075c335cc1dd