Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e68c48f9 authored by Rusty Russell's avatar Rusty Russell
Browse files

virtio_net: unconditionally define struct virtio_net_hdr_v1. 



This was introduced in commit ed9ecb04,
but only defined if !VIRTIO_NET_NO_LEGACY.  We should always define
it: easier for users to have conditional legacy code.

Suggested-by: default avatar"Michael S. Tsirkin" <mst@redhat.com>
Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
parent 206ad06b

include/uapi/linux/virtio_net.h

+25 −29
Original line number Diff line number Diff line
@@ -74,39 +74,12 @@ struct virtio_net_config { 
	__u16 max_virtqueue_pairs;

} __attribute__((packed));



#ifndef VIRTIO_NET_NO_LEGACY

/* This header comes first in the scatter-gather list.

 * For legacy virtio, if VIRTIO_F_ANY_LAYOUT is not negotiated, it must

 * be the first element of the scatter-gather list.  If you don't

 * specify GSO or CSUM features, you can simply ignore the header. */

struct virtio_net_hdr {

#define VIRTIO_NET_HDR_F_NEEDS_CSUM	1	// Use csum_start, csum_offset

#define VIRTIO_NET_HDR_F_DATA_VALID	2	// Csum is valid

	__u8 flags;

#define VIRTIO_NET_HDR_GSO_NONE		0	// Not a GSO frame

#define VIRTIO_NET_HDR_GSO_TCPV4	1	// GSO frame, IPv4 TCP (TSO)

#define VIRTIO_NET_HDR_GSO_UDP		3	// GSO frame, IPv4 UDP (UFO)

#define VIRTIO_NET_HDR_GSO_TCPV6	4	// GSO frame, IPv6 TCP

#define VIRTIO_NET_HDR_GSO_ECN		0x80	// TCP has ECN set

	__u8 gso_type;

	__virtio16 hdr_len;		/* Ethernet + IP + tcp/udp hdrs */

	__virtio16 gso_size;		/* Bytes to append to hdr_len per frame */

	__virtio16 csum_start;	/* Position to start checksumming from */

	__virtio16 csum_offset;	/* Offset after that to place checksum */

};



/* This is the version of the header to use when the MRG_RXBUF

 * feature has been negotiated. */

struct virtio_net_hdr_mrg_rxbuf {

	struct virtio_net_hdr hdr;

	__virtio16 num_buffers;	/* Number of merged rx buffers */

};

#else /* ... VIRTIO_NET_NO_LEGACY */

/*

 * This header comes first in the scatter-gather list.  If you don't

 * specify GSO or CSUM features, you can simply ignore the header.

 *

 * This is bitwise-equivalent to the legacy struct virtio_net_hdr_mrg_rxbuf.

 * This is bitwise-equivalent to the legacy struct virtio_net_hdr_mrg_rxbuf,

 * only flattened.

 */

struct virtio_net_hdr_v1 {

#define VIRTIO_NET_HDR_F_NEEDS_CSUM	1	/* Use csum_start, csum_offset */
@@ -124,6 +97,29 @@ struct virtio_net_hdr_v1 { 
	__virtio16 csum_offset;	/* Offset after that to place checksum */

	__virtio16 num_buffers;	/* Number of merged rx buffers */

};



#ifndef VIRTIO_NET_NO_LEGACY

/* This header comes first in the scatter-gather list.

 * For legacy virtio, if VIRTIO_F_ANY_LAYOUT is not negotiated, it must

 * be the first element of the scatter-gather list.  If you don't

 * specify GSO or CSUM features, you can simply ignore the header. */

struct virtio_net_hdr {

	/* See VIRTIO_NET_HDR_F_* */

	__u8 flags;

	/* See VIRTIO_NET_HDR_GSO_* */

	__u8 gso_type;

	__virtio16 hdr_len;		/* Ethernet + IP + tcp/udp hdrs */

	__virtio16 gso_size;		/* Bytes to append to hdr_len per frame */

	__virtio16 csum_start;	/* Position to start checksumming from */

	__virtio16 csum_offset;	/* Offset after that to place checksum */

};



/* This is the version of the header to use when the MRG_RXBUF

 * feature has been negotiated. */

struct virtio_net_hdr_mrg_rxbuf {

	struct virtio_net_hdr hdr;

	__virtio16 num_buffers;	/* Number of merged rx buffers */

};

#endif /* ...VIRTIO_NET_NO_LEGACY */



/*