Merge branch 'mac802154'

Browse source

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>

...

This commit is contained in:

David S. Miller 2014-06-11 12:11:25 -07:00

parent d5c4858237 2d3b5b0a90

commit 9181a6bd18

3 changed files with 18 additions and 10 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

3

net/mac802154/monitor.c

View file

11

net/mac802154/rx.c

View file

14

net/mac802154/wpan.c

View file