diff options
| author | Nicolas Dichtel <nicolas.dichtel@6wind.com> | 2014-09-17 10:08:08 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-09-22 14:10:07 -0400 |
| commit | 07d92d5cc977a7fe1e683e1d4a6f723f7f2778cb (patch) | |
| tree | 5b2b566e2a4badedd4b3311e069867a5a43fc615 | |
| parent | 4e5f9ef380b00871995d638c03e7ae7c67244e31 (diff) | |
| download | op-kernel-dev-07d92d5cc977a7fe1e683e1d4a6f723f7f2778cb.zip op-kernel-dev-07d92d5cc977a7fe1e683e1d4a6f723f7f2778cb.tar.gz | |
macvlan: allow to enqueue broadcast pkt on virtual device
Since commit 412ca1550cbe ("macvlan: Move broadcasts into a work queue"), the
driver uses tx_queue_len of the master device as the limit of packets enqueuing.
Problem is that virtual drivers have this value set to 0, thus all broadcast
packets were rejected.
Because tx_queue_len was arbitrarily chosen, I replace it with a static limit
of 1000 (also arbitrarily chosen).
CC: Herbert Xu <herbert@gondor.apana.org.au>
Reported-by: Thibaut Collet <thibaut.collet@6wind.com>
Suggested-by: Thibaut Collet <thibaut.collet@6wind.com>
Tested-by: Thibaut Collet <thibaut.collet@6wind.com>
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/macvlan.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c index 7652fd1..726edab 100644 --- a/drivers/net/macvlan.c +++ b/drivers/net/macvlan.c @@ -36,6 +36,7 @@ #include <linux/netpoll.h> #define MACVLAN_HASH_SIZE (1 << BITS_PER_BYTE) +#define MACVLAN_BC_QUEUE_LEN 1000 struct macvlan_port { struct net_device *dev; @@ -248,7 +249,7 @@ static void macvlan_broadcast_enqueue(struct macvlan_port *port, goto err; spin_lock(&port->bc_queue.lock); - if (skb_queue_len(&port->bc_queue) < skb->dev->tx_queue_len) { + if (skb_queue_len(&port->bc_queue) < MACVLAN_BC_QUEUE_LEN) { __skb_queue_tail(&port->bc_queue, nskb); err = 0; } |
