diff options
| author | David Ward <david.ward@ll.mit.edu> | 2011-09-18 12:53:20 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-11-11 09:36:26 -0800 |
| commit | 89c32c14c190c6113187c7c57784695701e314e4 (patch) | |
| tree | 22e8e7d5e424e395a9535bfc08f67574ecb6d39a /drivers/net/macvlan.c | |
| parent | c11deb8d898318a2fea9a291b16a7a2b2507cc94 (diff) | |
| download | kernel_samsung_smdk4412-89c32c14c190c6113187c7c57784695701e314e4.zip kernel_samsung_smdk4412-89c32c14c190c6113187c7c57784695701e314e4.tar.gz kernel_samsung_smdk4412-89c32c14c190c6113187c7c57784695701e314e4.tar.bz2 | |
macvlan/macvtap: Fix unicast between macvtap interfaces in bridge mode
[ Upstream commit cb2d0f3e968bff7c6d262aca3e3ab8d4184e69b2 ]
Packets should always be forwarded to the lowerdev using dev_forward_skb.
vlan->forward is for packets being forwarded directly to another macvlan/
macvtap device (used for multicast in bridge mode).
Reported-and-tested-by: Shlomo Pongratz <shlomop@mellanox.com>
Signed-off-by: David Ward <david.ward@ll.mit.edu>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/net/macvlan.c')
| -rw-r--r-- | drivers/net/macvlan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c index 2f3c48d..ab4723d 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; } |