This patch part reverts fd2a0437dc33 and e858fae2b0b8 which introduced a subtle change in how the virtio_net flags are derived from the SKBs ip_summed field. With the above commits, the flags are set to VIRTIO_NET_HDR_F_DATA_VALID when ip_summed == CHECKSUM_UNNECESSARY, thus treating it differently to ip_summed == CHECKSUM_NONE, which should be the same. Further, the virtio spec 1.0 / CS04 explicitly says that VIRTIO_NET_HDR_F_DATA_VALID must not be set by the driver.
Unified · Split
| @@ -91,8 +91,6 @@ static inline int virtio_net_hdr_from_skb(const struct sk_buff *skb, · 90 unmodified lines | |||
| 91 | skb_checksum_start_offset(skb)); | 91 | skb_checksum_start_offset(skb)); |
| 92 | hdr->csum_offset = __cpu_to_virtio16(little_endian, | 92 | hdr->csum_offset = __cpu_to_virtio16(little_endian, |
| 93 | skb->csum_offset); | 93 | skb->csum_offset); |
| 94 | } else if (skb->ip_summed == CHECKSUM_UNNECESSARY) { | ||
| 95 | hdr->flags = VIRTIO_NET_HDR_F_DATA_VALID; | ||
| 96 | } /* else everything is zero */ | 94 | } /* else everything is zero */ |
| 97 | 95 | ||
| 98 | return 0; | 96 | return 0; |