igb: Fix sparse warning about passing __beXX into leXX_to_cpup
authorAlexander Duyck <aduyck@mirantis.com>
Fri, 18 Mar 2016 23:06:53 +0000 (16:06 -0700)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Wed, 6 Apr 2016 19:16:07 +0000 (12:16 -0700)
We were casting the addr as __beXX and then passing it into le32_to_cpu
because the device expects the MAC address to be in network order even
though the register set is little endian.  Instead of casting it as __beXX
we can just cast it as __leXX in order to maintain consistency since the
region of memory is already in little endian order as far as we are
concerned.

Signed-off-by: Alexander Duyck <aduyck@mirantis.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
drivers/net/ethernet/intel/igb/igb_main.c

index 55a1405cb2a143409f85e969182f612e8a626879..36814a2e326dad6955beab0bb34c883590700ab2 100644 (file)
@@ -7845,11 +7845,13 @@ static void igb_rar_set_qsel(struct igb_adapter *adapter, u8 *addr, u32 index,
        struct e1000_hw *hw = &adapter->hw;
        u32 rar_low, rar_high;
 
-       /* HW expects these in little endian so we reverse the byte order
-        * from network order (big endian) to CPU endian
+       /* HW expects these to be in network order when they are plugged
+        * into the registers which are little endian.  In order to guarantee
+        * that ordering we need to do an leXX_to_cpup here in order to be
+        * ready for the byteswap that occurs with writel
         */
-       rar_low = le32_to_cpup((__be32 *)(addr));
-       rar_high = le16_to_cpup((__be16 *)(addr + 4));
+       rar_low = le32_to_cpup((__le32 *)(addr));
+       rar_high = le16_to_cpup((__le16 *)(addr + 4));
 
        /* Indicate to hardware the Address is Valid. */
        rar_high |= E1000_RAH_AV;