ixgbe endianness annotations

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

2 files changed, 30 insertions, 30 deletions

diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index 28c0fac1feed..3732dd6c4b2a 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -2106,7 +2106,7 @@ static int ixgbe_tso(struct ixgbe_adapter *adapter,
                 l4len = tcp_hdrlen(skb);
                 *hdr_len += l4len;
 
-                if (skb->protocol == ntohs(ETH_P_IP)) {
+                if (skb->protocol == htons(ETH_P_IP)) {
                         struct iphdr *iph = ip_hdr(skb);
                         iph->tot_len = 0;
                         iph->check = 0;
@@ -2147,7 +2147,7 @@ static int ixgbe_tso(struct ixgbe_adapter *adapter,
                 type_tucmd_mlhl |= (IXGBE_TXD_CMD_DEXT |
                                     IXGBE_ADVTXD_DTYP_CTXT);
 
-                if (skb->protocol == ntohs(ETH_P_IP))
+                if (skb->protocol == htons(ETH_P_IP))
                         type_tucmd_mlhl |= IXGBE_ADVTXD_TUCMD_IPV4;
                 type_tucmd_mlhl |= IXGBE_ADVTXD_TUCMD_L4T_TCP;
                 context_desc->type_tucmd_mlhl = cpu_to_le32(type_tucmd_mlhl);
@@ -2202,7 +2202,7 @@ static bool ixgbe_tx_csum(struct ixgbe_adapter *adapter,
                                     IXGBE_ADVTXD_DTYP_CTXT);
 
                 if (skb->ip_summed == CHECKSUM_PARTIAL) {
-                        if (skb->protocol == ntohs(ETH_P_IP))
+                        if (skb->protocol == htons(ETH_P_IP))
                                 type_tucmd_mlhl |= IXGBE_ADVTXD_TUCMD_IPV4;
 
                         if (skb->sk->sk_protocol == IPPROTO_TCP)
@@ -2402,7 +2402,7 @@ static int ixgbe_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
                 tx_flags |= (vlan_tx_tag_get(skb) << IXGBE_TX_FLAGS_VLAN_SHIFT);
         }
 
-        if (skb->protocol == ntohs(ETH_P_IP))
+        if (skb->protocol == htons(ETH_P_IP))
                 tx_flags |= IXGBE_TX_FLAGS_IPV4;
         first = tx_ring->next_to_use;
         tso = ixgbe_tso(adapter, tx_ring, skb, tx_flags, &hdr_len);
diff --git a/drivers/net/ixgbe/ixgbe_type.h b/drivers/net/ixgbe/ixgbe_type.h
index e60787a66e58..1ad7cb9c25a8 100644
--- a/drivers/net/ixgbe/ixgbe_type.h
+++ b/drivers/net/ixgbe/ixgbe_type.h
@@ -1003,19 +1003,19 @@
 struct ixgbe_legacy_tx_desc {
         u64 buffer_addr;       /* Address of the descriptor's data buffer */
         union {
-                u32 data;
+                __le32 data;
                 struct {
-                        u16 length;    /* Data buffer length */
+                        __le16 length;    /* Data buffer length */
                         u8 cso; /* Checksum offset */
                         u8 cmd; /* Descriptor control */
                 } flags;
         } lower;
         union {
-                u32 data;
+                __le32 data;
                 struct {
                         u8 status;     /* Descriptor status */
                         u8 css; /* Checksum start */
-                        u16 vlan;
+                        __le16 vlan;
                 } fields;
         } upper;
 };
@@ -1023,61 +1023,61 @@ struct ixgbe_legacy_tx_desc {
 /* Transmit Descriptor - Advanced */
 union ixgbe_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;
 };
 
 /* Receive Descriptor - Legacy */
 struct ixgbe_legacy_rx_desc {
-        u64 buffer_addr; /* Address of the descriptor's data buffer */
-        u16 length;      /* Length of data DMAed into data buffer */
+        __le64 buffer_addr; /* Address of the descriptor's data buffer */
+        __le16 length;      /* Length of data DMAed into data buffer */
         u16 csum;        /* Packet checksum */
         u8 status;       /* Descriptor status */
         u8 errors;       /* Descriptor Errors */
-        u16 vlan;
+        __le16 vlan;
 };
 
 /* Receive Descriptor - Advanced */
 union ixgbe_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 {
                         struct {
-                                u16 pkt_info; /* RSS type, Packet type */
-                                u16 hdr_info; /* Split Header, header len */
+                                __le16 pkt_info; /* RSS type, Packet type */
+                                __le16 hdr_info; /* Split Header, header len */
                         } lo_dword;
                         union {
-                                u32 rss; /* RSS Hash */
+                                __le32 rss; /* RSS Hash */
                                 struct {
-                                        u16 ip_id; /* IP id */
+                                        __le16 ip_id; /* IP id */
                                         u16 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 */
 };
 
 /* Context descriptors */
 struct ixgbe_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;
 };
 
 /* Adv Transmit Descriptor Config Masks */