e1000 endianness annotations (3e18826c) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/net/e1000/e1000_hw.h

+43 −43

Original line number	Diff line number	Diff line
		@@ -595,35 +595,35 @@ int32_t e1000_check_phy_reset_block(struct e1000_hw *hw);

		/* Receive Descriptor */
		struct e1000_rx_desc {
		uint64_t buffer_addr; /* Address of the descriptor's data buffer */
		uint16_t length; /* Length of data DMAed into data buffer */
		uint16_t csum; /* Packet checksum */
		__le64 buffer_addr; /* Address of the descriptor's data buffer */
		__le16 length; /* Length of data DMAed into data buffer */
		__le16 csum; /* Packet checksum */
		uint8_t status; /* Descriptor status */
		uint8_t errors; /* Descriptor Errors */
		uint16_t special;
		__le16 special;
		};

		/* Receive Descriptor - Extended */
		union e1000_rx_desc_extended {
		struct {
		uint64_t buffer_addr;
		uint64_t reserved;
		__le64 buffer_addr;
		__le64 reserved;
		} read;
		struct {
		struct {
		uint32_t mrq; /* Multiple Rx Queues */
		__le32 mrq; /* Multiple Rx Queues */
		union {
		uint32_t rss; /* RSS Hash */
		__le32 rss; /* RSS Hash */
		struct {
		uint16_t ip_id; /* IP id */
		uint16_t csum; /* Packet Checksum */
		__le16 ip_id; /* IP id */
		__le16 csum; /* Packet Checksum */
		} csum_ip;
		} hi_dword;
		} lower;
		struct {
		uint32_t status_error; /* ext status/error */
		uint16_t length;
		uint16_t vlan; /* VLAN tag */
		__le32 status_error; /* ext status/error */
		__le16 length;
		__le16 vlan; /* VLAN tag */
		} upper;
		} wb; /* writeback */
		};
		@@ -633,29 +633,29 @@ union e1000_rx_desc_extended {
		union e1000_rx_desc_packet_split {
		struct {
		/* one buffer for protocol header(s), three data buffers */
		uint64_t buffer_addr[MAX_PS_BUFFERS];
		__le64 buffer_addr[MAX_PS_BUFFERS];
		} read;
		struct {
		struct {
		uint32_t mrq; /* Multiple Rx Queues */
		__le32 mrq; /* Multiple Rx Queues */
		union {
		uint32_t rss; /* RSS Hash */
		__le32 rss; /* RSS Hash */
		struct {
		uint16_t ip_id; /* IP id */
		uint16_t csum; /* Packet Checksum */
		__le16 ip_id; /* IP id */
		__le16 csum; /* Packet Checksum */
		} csum_ip;
		} hi_dword;
		} lower;
		struct {
		uint32_t status_error; /* ext status/error */
		uint16_t length0; /* length of buffer 0 */
		uint16_t vlan; /* VLAN tag */
		__le32 status_error; /* ext status/error */
		__le16 length0; /* length of buffer 0 */
		__le16 vlan; /* VLAN tag */
		} middle;
		struct {
		uint16_t header_status;
		uint16_t length[3]; /* length of buffers 1-3 */
		__le16 header_status;
		__le16 length[3]; /* length of buffers 1-3 */
		} upper;
		uint64_t reserved;
		__le64 reserved;
		} wb; /* writeback */
		};

		@@ -715,21 +715,21 @@ union e1000_rx_desc_packet_split {

		/* Transmit Descriptor */
		struct e1000_tx_desc {
		uint64_t buffer_addr; /* Address of the descriptor's data buffer */
		__le64 buffer_addr; /* Address of the descriptor's data buffer */
		union {
		uint32_t data;
		__le32 data;
		struct {
		uint16_t length; /* Data buffer length */
		__le16 length; /* Data buffer length */
		uint8_t cso; /* Checksum offset */
		uint8_t cmd; /* Descriptor control */
		} flags;
		} lower;
		union {
		uint32_t data;
		__le32 data;
		struct {
		uint8_t status; /* Descriptor status */
		uint8_t css; /* Checksum start */
		uint16_t special;
		__le16 special;
		} fields;
		} upper;
		};
		@@ -759,49 +759,49 @@ struct e1000_tx_desc {
		/* Offload Context Descriptor */
		struct e1000_context_desc {
		union {
		uint32_t ip_config;
		__le32 ip_config;
		struct {
		uint8_t ipcss; /* IP checksum start */
		uint8_t ipcso; /* IP checksum offset */
		uint16_t ipcse; /* IP checksum end */
		__le16 ipcse; /* IP checksum end */
		} ip_fields;
		} lower_setup;
		union {
		uint32_t tcp_config;
		__le32 tcp_config;
		struct {
		uint8_t tucss; /* TCP checksum start */
		uint8_t tucso; /* TCP checksum offset */
		uint16_t tucse; /* TCP checksum end */
		__le16 tucse; /* TCP checksum end */
		} tcp_fields;
		} upper_setup;
		uint32_t cmd_and_length; /* */
		__le32 cmd_and_length; /* */
		union {
		uint32_t data;
		__le32 data;
		struct {
		uint8_t status; /* Descriptor status */
		uint8_t hdr_len; /* Header length */
		uint16_t mss; /* Maximum segment size */
		__le16 mss; /* Maximum segment size */
		} fields;
		} tcp_seg_setup;
		};

		/* Offload data descriptor */
		struct e1000_data_desc {
		uint64_t buffer_addr; /* Address of the descriptor's buffer address */
		__le64 buffer_addr; /* Address of the descriptor's buffer address */
		union {
		uint32_t data;
		__le32 data;
		struct {
		uint16_t length; /* Data buffer length */
		__le16 length; /* Data buffer length */
		uint8_t typ_len_ext; /* */
		uint8_t cmd; /* */
		} flags;
		} lower;
		union {
		uint32_t data;
		__le32 data;
		struct {
		uint8_t status; /* Descriptor status */
		uint8_t popts; /* Packet Options */
		uint16_t special; /* */
		__le16 special; /* */
		} fields;
		} upper;
		};
		@@ -817,8 +817,8 @@ struct e1000_data_desc {

		/* Receive Address Register */
		struct e1000_rar {
		volatile uint32_t low; /* receive address low */
		volatile uint32_t high; /* receive address high */
		volatile __le32 low; /* receive address low */
		volatile __le32 high; /* receive address high */
		};

		/* Number of entries in the Multicast Table Array (MTA). */

drivers/net/e1000/e1000_main.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -272,14 +272,14 @@ module_exit(e1000_exit_module);
		static int e1000_request_irq(struct e1000_adapter *adapter)
		{
		struct net_device *netdev = adapter->netdev;
		void (*handler) = &e1000_intr;
		irq_handler_t handler = e1000_intr;
		int irq_flags = IRQF_SHARED;
		int err;

		if (adapter->hw.mac_type >= e1000_82571) {
		adapter->have_msi = !pci_enable_msi(adapter->pdev);
		if (adapter->have_msi) {
		handler = &e1000_intr_msi;
		handler = e1000_intr_msi;
		irq_flags = 0;
		}
		}
		@@ -4092,8 +4092,8 @@ e1000_rx_checksum(struct e1000_adapter *adapter,
		/* Hardware complements the payload checksum, so we undo it
		* and then put the value in host order for further stack use.
		*/
		csum = ntohl(csum ^ 0xFFFF);
		skb->csum = csum;
		__sum16 sum = (__force __sum16)htons(csum);
		skb->csum = csum_unfold(~sum);
		skb->ip_summed = CHECKSUM_COMPLETE;
		}
		adapter->hw_csum_good++;
		@@ -4621,7 +4621,7 @@ e1000_alloc_rx_buffers_ps(struct e1000_adapter *adapter,
		rx_desc->read.buffer_addr[j+1] =
		cpu_to_le64(ps_page_dma->ps_page_dma[j]);
		} else
		rx_desc->read.buffer_addr[j+1] = ~0;
		rx_desc->read.buffer_addr[j+1] = ~cpu_to_le64(0);
		}

		skb = netdev_alloc_skb(netdev,