Changing ip_summed from CHECKSUM_PARTIAL to CHECKSUM_UNNECESSARY
will result in an incorrect checksum if the packet is sent off the box.

Cc: sta...@vger.kernel.org
Signed-off-by: Michael Spang <sp...@chromium.org>
---
 drivers/net/macvlan.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index 753a8c2..806b56a 100644
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -267,7 +267,9 @@ static int macvlan_queue_xmit(struct sk_buff *skb, struct 
net_device *dev)
 
        if (vlan->mode == MACVLAN_MODE_BRIDGE) {
                const struct ethhdr *eth = (void *)skb->data;
-               skb->ip_summed = CHECKSUM_UNNECESSARY;
+
+               if (skb->ip_summed == CHECKSUM_NONE)
+                       skb->ip_summed = CHECKSUM_UNNECESSARY;
 
                /* send to other bridge ports directly */
                if (is_multicast_ether_addr(eth->h_dest)) {
-- 
2.0.0.rc2

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to