From: David S. Miller <davem@davemloft.net>
Date: Mon, 1 May 2017 14:42:38 +0000 (-0400)
Subject: Merge branch 'bpf-samples-skb_mode-bug-fixes'
X-Git-Tag: v4.12-rc1~129^2~33
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=edd7f4efa8111efc279582290acc4d54d405748a;p=linux.git

Merge branch 'bpf-samples-skb_mode-bug-fixes'

Jesper Dangaard Brouer says:

====================
samples/bpf: two bug fixes to XDP_FLAGS_SKB_MODE attaching

Two small bugfixes for:
 commit 3993f2cb983b ("samples/bpf: Add support for SKB_MODE to xdp1 and xdp_tx_iptunnel")
====================

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

edd7f4efa8111efc279582290acc4d54d405748a