summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-10-06 16:15:10 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-10-06 16:15:10 -0700
commit3ee72ca99288f1de95ec9c570e43f531c8799f06 (patch)
tree1199d129cb94b128eb6029d5fcc3ff0d4900b067 /drivers
parent29cf7a30f8a0ce4af2406d93d5a332099be26923 (diff)
parent186c6bbced722cfeff041d2a1264c95f5d042050 (diff)
downloadlinux-3ee72ca99288f1de95ec9c570e43f531c8799f06.tar.bz2
Merge git://github.com/davem330/net
* git://github.com/davem330/net: net: fix typos in Documentation/networking/scaling.txt bridge: leave carrier on for empty bridge netfilter: Use proper rwlock init function tcp: properly update lost_cnt_hint during shifting tcp: properly handle md5sig_pool references macvlan/macvtap: Fix unicast between macvtap interfaces in bridge mode
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/macvlan.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index 05172c39a0ce..376e3e94bae0 100644
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -239,7 +239,7 @@ static int macvlan_queue_xmit(struct sk_buff *skb, struct net_device *dev)
dest = macvlan_hash_lookup(port, eth->h_dest);
if (dest && dest->mode == MACVLAN_MODE_BRIDGE) {
/* send to lowerdev first for its network taps */
- vlan->forward(vlan->lowerdev, skb);
+ dev_forward_skb(vlan->lowerdev, skb);
return NET_XMIT_SUCCESS;
}