* [PATCH] macvlan: Fix checksum errors when ip_summed is CHECKSUM_PARTIAL
@ 2014-05-19 17:24 Michael Spang
2014-05-19 21:24 ` Vlad Yasevich
0 siblings, 1 reply; 2+ messages in thread
From: Michael Spang @ 2014-05-19 17:24 UTC (permalink / raw)
To: Patrick McHardy; +Cc: netdev, linux-kernel, Michael Spang, stable
Changing ip_summed from CHECKSUM_PARTIAL to CHECKSUM_UNNECESSARY
will result in an incorrect checksum if the packet is sent off the box.
Cc: stable@vger.kernel.org
Signed-off-by: Michael Spang <spang@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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] macvlan: Fix checksum errors when ip_summed is CHECKSUM_PARTIAL
2014-05-19 17:24 [PATCH] macvlan: Fix checksum errors when ip_summed is CHECKSUM_PARTIAL Michael Spang
@ 2014-05-19 21:24 ` Vlad Yasevich
0 siblings, 0 replies; 2+ messages in thread
From: Vlad Yasevich @ 2014-05-19 21:24 UTC (permalink / raw)
To: Michael Spang, Patrick McHardy; +Cc: netdev, linux-kernel, stable
On 05/19/2014 01:24 PM, Michael Spang wrote:
> Changing ip_summed from CHECKSUM_PARTIAL to CHECKSUM_UNNECESSARY
> will result in an incorrect checksum if the packet is sent off the box.
>
> Cc: stable@vger.kernel.org
> Signed-off-by: Michael Spang <spang@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)) {
>
Already done. See commit f114890cdf84d753f6b41cd0cc44ba51d16313da
-vlad
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-05-19 21:24 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-19 17:24 [PATCH] macvlan: Fix checksum errors when ip_summed is CHECKSUM_PARTIAL Michael Spang
2014-05-19 21:24 ` Vlad Yasevich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).