]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge branch 'mac802154'
authorDavid S. Miller <davem@davemloft.net>
Wed, 11 Jun 2014 19:11:25 +0000 (12:11 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 11 Jun 2014 19:11:25 +0000 (12:11 -0700)
commit9181a6bd18009bf417bc865fd862075c335cc1dd
treebad4e444da804759fe1d8f91d4a940cdcb4ca1fb
parentd5c4858237fe43c30714f4447ccec87d5fb3fcde
parent2d3b5b0a90e5370ad13ca98d95519c3e41d2c925
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>