commit fe248fc2c18004fe88419c85a948ee69d7c4a154
author Bob Copeland <me@bobcopeland.com> Wed Nov 01 23:35:03 2017 -0400
committer Bob Copeland <me@bobcopeland.com> Wed Nov 01 23:35:03 2017 -0400
tree 49f2aaa811a691a50e4692dba8193c9eee8fb476
parent b5072acc87b05efe259f734b7f343b70c5747525

w-t: fix up some merge damage

Signed-off-by: Bob Copeland <me@bobcopeland.com>

drivers/net/ethernet/netronome/nfp/flower/action.c

diff --git a/drivers/net/ethernet/netronome/nfp/flower/action.c b/drivers/net/ethernet/netronome/nfp/flower/action.c
index f3e5e65..1194c47 100644
--- a/drivers/net/ethernet/netronome/nfp/flower/action.c
+++ b/drivers/net/ethernet/netronome/nfp/flower/action.c
@@ -245,8 +245,6 @@
 
 	if (off + 4 > ETH_ALEN * 2)
 		return -EOPNOTSUPP;
-	if (!nfp_netdev_is_nfp_repr(out_dev))
-		return -EOPNOTSUPP;
 
 	mask = ~tcf_pedit_mask(action, idx);
 	exact = tcf_pedit_val(action, idx);

kernel/bpf/verifier.c

diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
index 921d4b0..44ff5f6 100644
--- a/kernel/bpf/verifier.c
+++ b/kernel/bpf/verifier.c
@@ -1007,7 +1007,7 @@
 		 * determine what type of data were returned.
 		 */
 		if (reg->off) {
-			verbose("dereference of modified ctx ptr R%d off=%d+%d, ctx+const is allowed, ctx+const+const is not\n",
+			verbose(env, "dereference of modified ctx ptr R%d off=%d+%d, ctx+const is allowed, ctx+const+const is not\n",
 				regno, reg->off, off - reg->off);
 			return -EACCES;
 		}
@@ -2351,8 +2351,7 @@
 	u16 new_range;
 	int i;
 
-	if (dst_reg->off < 0 ||
-	    (dst_reg->off == 0 && range_right_open))
+	if (dst_reg->off < 0)
 		/* This doesn't give us any range */
 		return;
 
@@ -2364,8 +2363,6 @@
 		return;
 
 	new_range = dst_reg->off;
-	if (range_right_open)
-		new_range--;
 
 	/* Examples for register markings:
 	 *

net/sched/cls_flower.c

diff --git a/net/sched/cls_flower.c b/net/sched/cls_flower.c
index a82984d..822606a 100644
--- a/net/sched/cls_flower.c
+++ b/net/sched/cls_flower.c
@@ -219,7 +219,6 @@
 	tc_cls_common_offload_init(&cls_flower.common, tp);
 	cls_flower.command = TC_CLSFLOWER_DESTROY;
 	cls_flower.cookie = (unsigned long) f;
-	cls_flower.egress_dev = f->hw_dev != tp->q->dev_queue->dev;
 
 	if (tc_can_offload(dev))
 		dev->netdev_ops->ndo_setup_tc(dev, TC_SETUP_CLSFLOWER,
@@ -281,7 +280,6 @@
 	cls_flower.command = TC_CLSFLOWER_STATS;
 	cls_flower.cookie = (unsigned long) f;
 	cls_flower.exts = &f->exts;
-	cls_flower.egress_dev = f->hw_dev != tp->q->dev_queue->dev;
 
 	if (tc_can_offload(dev))
 		dev->netdev_ops->ndo_setup_tc(dev, TC_SETUP_CLSFLOWER,