| From foo@baz Wed May 28 21:03:54 PDT 2014 |
| From: Vlad Yasevich <vyasevic@redhat.com> |
| Date: Tue, 29 Apr 2014 10:09:51 -0400 |
| Subject: Revert "macvlan : fix checksums error when we are in |
| bridge mode" |
| |
| From: Vlad Yasevich <vyasevic@redhat.com> |
| |
| [ Upstream commit f114890cdf84d753f6b41cd0cc44ba51d16313da ] |
| |
| This reverts commit 12a2856b604476c27d85a5f9a57ae1661fc46019. |
| 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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/net/macvlan.c | 3 --- |
| 1 file changed, 3 deletions(-) |
| |
| --- a/drivers/net/macvlan.c |
| +++ b/drivers/net/macvlan.c |
| @@ -263,11 +263,9 @@ static int macvlan_queue_xmit(struct sk_ |
| 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_ |
| } |
| |
| xmit_world: |
| - skb->ip_summed = ip_summed; |
| skb->dev = vlan->lowerdev; |
| return dev_queue_xmit(skb); |
| } |