net: dlink: Correct endian treatment of t_SROM data

As it's name suggests, parse_eeprom() parses EEPROM data.

This is done by reading data, 16 bits at a time as follows:

  for (i = 0; i < 128; i++)
    ((__le16 *) sromdata)[i] = cpu_to_le16(read_eeprom(np, i));

sromdata is at the same memory location as psrom.
And the type of psrom is a pointer to struct t_SROM.

As can be seen in the loop above, data is stored in sromdata, and thus
psrom, as 16-bit little-endian values. However, the integer fields of
t_SROM are host byte order.

In the case of the led_mode field this results in a but which has been
addressed by commit e7e5ae71831c ("net: dlink: Correct endianness
handling of led_mode").

In the case of the remaining fields, which are updated by this patch,
I do not believe this does not result in any bugs. But it does seem
best to correctly annotate the endianness of integers.

Flagged by Sparse as:

  .../dl2k.c:344:35: warning: restricted __le32 degrades to integer

Compile tested only.
No run-time change intended.

Signed-off-by: Simon Horman <horms@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/dlink/dl2k.h b/drivers/net/ethernet/dlink/dl2k.h
index 56aff2f0bdbfa0c660ebc79934c13b029dddd92b..ba679025e86674fd382690c89686069f06456830 100644 (file)
--- a/drivers/net/ethernet/dlink/dl2k.h
+++ b/drivers/net/ethernet/dlink/dl2k.h
@@ -329,18 +329,18 @@ enum _pcs_anlpar {
 };
 
 typedef struct t_SROM {
-       u16 config_param;       /* 0x00 */
-       u16 asic_ctrl;          /* 0x02 */
-       u16 sub_vendor_id;      /* 0x04 */
-       u16 sub_system_id;      /* 0x06 */
-       u16 pci_base_1;         /* 0x08 (IP1000A only) */
-       u16 pci_base_2;         /* 0x0a (IP1000A only) */
+       __le16 config_param;    /* 0x00 */
+       __le16 asic_ctrl;       /* 0x02 */
+       __le16 sub_vendor_id;   /* 0x04 */
+       __le16 sub_system_id;   /* 0x06 */
+       __le16 pci_base_1;      /* 0x08 (IP1000A only) */
+       __le16 pci_base_2;      /* 0x0a (IP1000A only) */
        __le16 led_mode;        /* 0x0c (IP1000A only) */
-       u16 reserved1[9];       /* 0x0e-0x1f */
+       __le16 reserved1[9];    /* 0x0e-0x1f */
        u8 mac_addr[6];         /* 0x20-0x25 */
        u8 reserved2[10];       /* 0x26-0x2f */
        u8 sib[204];            /* 0x30-0xfb */
-       u32 crc;                /* 0xfc-0xff */
+       __le32 crc;             /* 0xfc-0xff */
 } SROM_t, *PSROM_t;
 
 /* Ioctl custom data */