diff options
Diffstat (limited to 'include/linux/netdevice.h')
-rw-r--r-- | include/linux/netdevice.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 813bed723f5..9fc6ee8e750 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
@@ -2089,12 +2089,12 @@ static inline void skb_bond_set_mac_by_master(struct sk_buff *skb, | |||
2089 | * duplicates except for 802.3ad ETH_P_SLOW, alb non-mcast/bcast, and | 2089 | * duplicates except for 802.3ad ETH_P_SLOW, alb non-mcast/bcast, and |
2090 | * ARP on active-backup slaves with arp_validate enabled. | 2090 | * ARP on active-backup slaves with arp_validate enabled. |
2091 | */ | 2091 | */ |
2092 | static inline int skb_bond_should_drop(struct sk_buff *skb) | 2092 | static inline int skb_bond_should_drop(struct sk_buff *skb, |
2093 | struct net_device *master) | ||
2093 | { | 2094 | { |
2094 | struct net_device *dev = skb->dev; | ||
2095 | struct net_device *master = dev->master; | ||
2096 | |||
2097 | if (master) { | 2095 | if (master) { |
2096 | struct net_device *dev = skb->dev; | ||
2097 | |||
2098 | if (master->priv_flags & IFF_MASTER_ARPMON) | 2098 | if (master->priv_flags & IFF_MASTER_ARPMON) |
2099 | dev->last_rx = jiffies; | 2099 | dev->last_rx = jiffies; |
2100 | 2100 | ||