diff options
| author | David S. Miller | 2010-03-20 23:24:29 +0100 |
|---|---|---|
| committer | David S. Miller | 2010-03-20 23:24:29 +0100 |
| commit | e77c8e83dd587f2616d7ff20d23a897891e6e20d (patch) | |
| tree | ba5d2ce6541119f329b2fd51181aaae8528b38f0 /include/linux/netdevice.h | |
| parent | enic: Clean up: Change driver description; Fix tab space; Update MAINTAINERS (diff) | |
| parent | Merge branch 'vhost' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost (diff) | |
| download | kernel-qcow2-linux-e77c8e83dd587f2616d7ff20d23a897891e6e20d.tar.gz kernel-qcow2-linux-e77c8e83dd587f2616d7ff20d23a897891e6e20d.tar.xz kernel-qcow2-linux-e77c8e83dd587f2616d7ff20d23a897891e6e20d.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
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 813bed723f58..9fc6ee8e7508 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, * duplicates except for 802.3ad ETH_P_SLOW, alb non-mcast/bcast, and * ARP on active-backup slaves with arp_validate enabled. */ -static inline int skb_bond_should_drop(struct sk_buff *skb) +static inline int skb_bond_should_drop(struct sk_buff *skb, + struct net_device *master) { - struct net_device *dev = skb->dev; - struct net_device *master = dev->master; - if (master) { + struct net_device *dev = skb->dev; + if (master->priv_flags & IFF_MASTER_ARPMON) dev->last_rx = jiffies; |