Commit 748b0620 authored Mar 18, 2021 by Greg Kroah-Hartman

Revert "net: check if protocol extracted by virtio_net_hdr_set_proto is correct"



This reverts commit 54ef8243 which is
commit 924a9bc362a5223cd448ca08c3dde21235adc310 upstream.

This breaks the ABI and is not needed in the android-4.19-stable branch
as the issue it was added for is not relevant here.

Bug: 161946584
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I0a0453de60f4a614448cc62736eb32681277a6e8

parent 04fd6558

include/linux/virtio_net.h

+1 −6

Original line number	Diff line number	Diff line
		@@ -79,13 +79,8 @@ static inline int virtio_net_hdr_to_skb(struct sk_buff *skb,
		if (gso_type && skb->network_header) {
		struct flow_keys_basic keys;

		if (!skb->protocol) {
		__be16 protocol = dev_parse_header_protocol(skb);

		if (!skb->protocol)
		virtio_net_hdr_set_proto(skb, hdr);
		if (protocol && protocol != skb->protocol)
		return -EINVAL;
		}
		retry:
		if (!skb_flow_dissect_flow_keys_basic(skb, &keys,
		NULL, 0, 0, 0,