Commit f114890c authored Apr 29, 2014 by Vlad Yasevich Committed by David S. Miller Apr 30, 2014

Revert "macvlan : fix checksums error when we are in bridge mode"



This reverts commit 12a2856b.
The commit above doesn't appear to be necessary any more as the
checksums appear to be correctly computed/validated.

Additionally the above commit breaks kvm configurations where
one VM is using a device that support checksum offload (virtio) and
the other VM does not.
In this case, packets leaving virtio device will have CHECKSUM_PARTIAL
set.  The packets is forwarded to a macvtap that has offload features
turned off.  Since we use CHECKSUM_UNNECESSARY, the host does does not
update the checksum and thus a bad checksum is passed up to
the guest.

CC: Daniel Lezcano <daniel.lezcano@free.fr>
CC: Patrick McHardy <kaber@trash.net>
CC: Andrian Nord <nightnord@gmail.com>
CC: Eric Dumazet <eric.dumazet@gmail.com>
CC: Michael S. Tsirkin <mst@redhat.com>
CC: Jason Wang <jasowang@redhat.com>
Signed-off-by: Vlad Yasevich <vyasevic@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Acked-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent cbdb0427

drivers/net/macvlan.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -263,11 +263,9 @@ static int macvlan_queue_xmit(struct sk_buff skb, struct net_device dev)
		const struct macvlan_dev *vlan = netdev_priv(dev);
		const struct macvlan_port *port = vlan->port;
		const struct macvlan_dev *dest;
		__u8 ip_summed = skb->ip_summed;

		if (vlan->mode == MACVLAN_MODE_BRIDGE) {
		const struct ethhdr eth = (void )skb->data;
		skb->ip_summed = CHECKSUM_UNNECESSARY;

		/* send to other bridge ports directly */
		if (is_multicast_ether_addr(eth->h_dest)) {
		@@ -285,7 +283,6 @@ static int macvlan_queue_xmit(struct sk_buff skb, struct net_device dev)
		}

		xmit_world:
		skb->ip_summed = ip_summed;
		skb->dev = vlan->lowerdev;
		return dev_queue_xmit(skb);
		}

Admin message