lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of github.com:davem330/net

Browse Source 
Conflicts:
	net/batman-adv/soft-interface.c
This commit is contained in:
David S. Miller
2011-10-07 13:38:43 -04:00
parent 8083f0fc96 3ee72ca992
commit 88c5100c28
178 changed files with 1255 additions and 1000 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/macvlan.c
View File

@@ -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;
}