4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Anton Ivanov <anton.iva...@cambridgegreys.com>
commit 5ec9121195a4f1cecd0fa592636c5f81eb03dc8c upstream.
Raw interface initialization needs QDISC_BYPASS. Otherwise
it sees its own packets when transmitting.
Fixes: 49da7e64f33e ("High Performance UML Vector Network Driver")
Cc: <sta...@vger.kernel.org>
Signed-off-by: Anton Ivanov <anton.iva...@cambridgegreys.com>
Signed-off-by: Richard Weinberger <rich...@nod.at>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>
---
arch/um/drivers/vector_kern.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
--- a/arch/um/drivers/vector_kern.c
+++ b/arch/um/drivers/vector_kern.c
@@ -188,7 +188,7 @@ static int get_transport_options(struct
if (strncmp(transport, TRANS_TAP, TRANS_TAP_LEN) == 0)
return (vec_rx | VECTOR_BPF);
if (strncmp(transport, TRANS_RAW, TRANS_RAW_LEN) == 0)
- return (vec_rx | vec_tx);
+ return (vec_rx | vec_tx | VECTOR_QDISC_BYPASS);
return (vec_rx | vec_tx);
}
@@ -1241,9 +1241,8 @@ static int vector_net_open(struct net_de
if ((vp->options & VECTOR_QDISC_BYPASS) != 0) {
if (!uml_raw_enable_qdisc_bypass(vp->fds->rx_fd))
- vp->options = vp->options | VECTOR_BPF;
+ vp->options |= VECTOR_BPF;
}
-
if ((vp->options & VECTOR_BPF) != 0)
vp->bpf = uml_vector_default_bpf(vp->fds->rx_fd, dev->dev_addr);
