Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 32d3e51a authored by Chris Dion's avatar Chris Dion Committed by David S. Miller
Browse files

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: default avatarChris Dion <christopher.dion@dell.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cc10f871

net/sched/sch_generic.c

+3 −0
Original line number Diff line number Diff line
@@ -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;