diff options
| author | Chris Dion <christopher.dion@dell.com> | 2017-12-06 16:50:28 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-12-06 21:34:10 +0100 |
| commit | 32d3e51a82d453762ef148b2c4fbc8a7ec374a88 (patch) | |
| tree | 026e59b49146c85f52334469d8ca7df62787469c /net/sched | |
| parent | xen-netback: Fix logging message with spurious period after newline (diff) | |
| download | linux-32d3e51a82d453762ef148b2c4fbc8a7ec374a88.tar.xz linux-32d3e51a82d453762ef148b2c4fbc8a7ec374a88.zip | |
net_sched: use macvlan real dev trans_start in dev_trans_start()
Macvlan devices are similar to vlans and do not update their
own trans_start. In order for arp monitoring to work for a bond device
when the slaves are macvlans, obtain its real device.
Signed-off-by: Chris Dion <christopher.dion@dell.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched')
| -rw-r--r-- | net/sched/sch_generic.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c index 3839cbbdc32b..cd1b200acae7 100644 --- a/net/sched/sch_generic.c +++ b/net/sched/sch_generic.c @@ -26,6 +26,7 @@ #include <linux/list.h> #include <linux/slab.h> #include <linux/if_vlan.h> +#include <linux/if_macvlan.h> #include <net/sch_generic.h> #include <net/pkt_sched.h> #include <net/dst.h> @@ -277,6 +278,8 @@ unsigned long dev_trans_start(struct net_device *dev) if (is_vlan_dev(dev)) dev = vlan_dev_real_dev(dev); + else if (netif_is_macvlan(dev)) + dev = macvlan_dev_real_dev(dev); res = netdev_get_tx_queue(dev, 0)->trans_start; for (i = 1; i < dev->num_tx_queues; i++) { val = netdev_get_tx_queue(dev, i)->trans_start; |