Merge branch 'cls_bpf'
authorDavid S. Miller <davem@davemloft.net>
Mon, 26 Jan 2015 23:50:24 +0000 (15:50 -0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 26 Jan 2015 23:50:24 +0000 (15:50 -0800)
commitb6663ad702d63f44ec7af01f34fbfb34abdd13a6
tree8d640016c0d8f2edd82147c2c24694f0f0ea3bd0
parent9e79ce66c6e930e815e1d3ad3b875b56dbe99c46
parent3f2ab135946dcd4eb6af92a53d6d4bd35e7526ca
Merge branch 'cls_bpf'

Daniel Borkmann says:

====================
Two cls_bpf fixes

Found them while doing a review on act_bpf and going over the
cls_bpf code again. Will also address the first issue in act_bpf
as it needs to be fixed there, too.
====================

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