Commit b6ce4a1c authored by Jesse Brandeburg's avatar Jesse Brandeburg Committed by Tony Nguyen
Browse files

igbvf: convert to strongly typed descriptors 



The igbvf driver for some reason never strongly typed it's descriptor
formats. Make this driver like the rest of the Intel drivers and use
__le* for our little endian descriptors.

Signed-off-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent de844713

drivers/net/ethernet/intel/igbvf/vf.h

+21 −21
Original line number Diff line number Diff line
@@ -35,31 +35,31 @@ struct e1000_hw; 
/* Receive Descriptor - Advanced */

union e1000_adv_rx_desc {

	struct {

		u64 pkt_addr; /* Packet buffer address */

		u64 hdr_addr; /* Header buffer address */

		__le64 pkt_addr; /* Packet buffer address */

		__le64 hdr_addr; /* Header buffer address */

	} read;

	struct {

		struct {

			union {

				u32 data;

				__le32 data;

				struct {

					u16 pkt_info; /* RSS/Packet type */

					__le16 pkt_info; /* RSS/Packet type */

					/* Split Header, hdr buffer length */

					u16 hdr_info;

					__le16 hdr_info;

				} hs_rss;

			} lo_dword;

			union {

				u32 rss; /* RSS Hash */

				__le32 rss; /* RSS Hash */

				struct {

					u16 ip_id; /* IP id */

					u16 csum;  /* Packet Checksum */

					__le16 ip_id; /* IP id */

					__le16 csum;  /* Packet Checksum */

				} csum_ip;

			} hi_dword;

		} lower;

		struct {

			u32 status_error; /* ext status/error */

			u16 length; /* Packet length */

			u16 vlan;   /* VLAN tag */

			__le32 status_error; /* ext status/error */

			__le16 length; /* Packet length */

			__le16 vlan; /* VLAN tag */

		} upper;

	} wb;  /* writeback */

};
@@ -70,14 +70,14 @@ union e1000_adv_rx_desc { 
/* Transmit Descriptor - Advanced */

union e1000_adv_tx_desc {

	struct {

		u64 buffer_addr; /* Address of descriptor's data buf */

		u32 cmd_type_len;

		u32 olinfo_status;

		__le64 buffer_addr; /* Address of descriptor's data buf */

		__le32 cmd_type_len;

		__le32 olinfo_status;

	} read;

	struct {

		u64 rsvd; /* Reserved */

		u32 nxtseq_seed;

		u32 status;

		__le64 rsvd; /* Reserved */

		__le32 nxtseq_seed;

		__le32 status;

	} wb;

};
@@ -94,10 +94,10 @@ union e1000_adv_tx_desc { 


/* Context descriptors */

struct e1000_adv_tx_context_desc {

	u32 vlan_macip_lens;

	u32 seqnum_seed;

	u32 type_tucmd_mlhl;

	u32 mss_l4len_idx;

	__le32 vlan_macip_lens;

	__le32 seqnum_seed;

	__le32 type_tucmd_mlhl;

	__le32 mss_l4len_idx;

};



#define E1000_ADVTXD_MACLEN_SHIFT	9  /* Adv ctxt desc mac len shift */