diff options
author | Anton Ivanov <anton.ivanov@cambridgegreys.com> | 2018-06-07 07:43:15 -0400 |
---|---|---|
committer | Richard Weinberger <richard@nod.at> | 2018-06-10 16:54:47 -0400 |
commit | 5ec9121195a4f1cecd0fa592636c5f81eb03dc8c (patch) | |
tree | 52ffa93fb1f547dbbc9a7987724f2b0feec932bf | |
parent | 4579a1ba692af81da7ea6ce197f8169ddc0c327f (diff) |
um: Fix raw interface options
Raw interface initialization needs QDISC_BYPASS. Otherwise
it sees its own packets when transmitting.
Fixes: 49da7e64f33e ("High Performance UML Vector Network Driver")
Cc: <stable@vger.kernel.org>
Signed-off-by: Anton Ivanov <anton.ivanov@cambridgegreys.com>
Signed-off-by: Richard Weinberger <richard@nod.at>
-rw-r--r-- | arch/um/drivers/vector_kern.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/um/drivers/vector_kern.c b/arch/um/drivers/vector_kern.c index 8b852928959b..cf9bf9b43ec3 100644 --- a/arch/um/drivers/vector_kern.c +++ b/arch/um/drivers/vector_kern.c | |||
@@ -188,7 +188,7 @@ static int get_transport_options(struct arglist *def) | |||
188 | if (strncmp(transport, TRANS_TAP, TRANS_TAP_LEN) == 0) | 188 | if (strncmp(transport, TRANS_TAP, TRANS_TAP_LEN) == 0) |
189 | return (vec_rx | VECTOR_BPF); | 189 | return (vec_rx | VECTOR_BPF); |
190 | if (strncmp(transport, TRANS_RAW, TRANS_RAW_LEN) == 0) | 190 | if (strncmp(transport, TRANS_RAW, TRANS_RAW_LEN) == 0) |
191 | return (vec_rx | vec_tx); | 191 | return (vec_rx | vec_tx | VECTOR_QDISC_BYPASS); |
192 | return (vec_rx | vec_tx); | 192 | return (vec_rx | vec_tx); |
193 | } | 193 | } |
194 | 194 | ||
@@ -1241,9 +1241,8 @@ static int vector_net_open(struct net_device *dev) | |||
1241 | 1241 | ||
1242 | if ((vp->options & VECTOR_QDISC_BYPASS) != 0) { | 1242 | if ((vp->options & VECTOR_QDISC_BYPASS) != 0) { |
1243 | if (!uml_raw_enable_qdisc_bypass(vp->fds->rx_fd)) | 1243 | if (!uml_raw_enable_qdisc_bypass(vp->fds->rx_fd)) |
1244 | vp->options = vp->options | VECTOR_BPF; | 1244 | vp->options |= VECTOR_BPF; |
1245 | } | 1245 | } |
1246 | |||
1247 | if ((vp->options & VECTOR_BPF) != 0) | 1246 | if ((vp->options & VECTOR_BPF) != 0) |
1248 | vp->bpf = uml_vector_default_bpf(vp->fds->rx_fd, dev->dev_addr); | 1247 | vp->bpf = uml_vector_default_bpf(vp->fds->rx_fd, dev->dev_addr); |
1249 | 1248 | ||