]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ice: add const qualifier to mac_addr parameter
authorJacob Keller <jacob.e.keller@intel.com>
Wed, 19 Dec 2018 18:03:34 +0000 (10:03 -0800)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Tue, 15 Jan 2019 20:42:38 +0000 (12:42 -0800)
The function ice_aq_manage_mac_write takes a pointer to a MAC address.
The parameter is not marked const, even though the function doesn't need
to modify it. This prevents passing a parameter that is already marked
const. Update the function prototype to take a const pointer, to allow
passing constant pointers to this function.

Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Signed-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
drivers/net/ethernet/intel/ice/ice_common.c
drivers/net/ethernet/intel/ice/ice_common.h

index ab308fc88920009ea5e67184b1ac62fba303659c..b17ade424423660fe84d7e78ae5a7e86e93d2e23 100644 (file)
@@ -1685,7 +1685,7 @@ enum ice_status ice_get_caps(struct ice_hw *hw)
  * This function is used to write MAC address to the NVM (0x0108).
  */
 enum ice_status
-ice_aq_manage_mac_write(struct ice_hw *hw, u8 *mac_addr, u8 flags,
+ice_aq_manage_mac_write(struct ice_hw *hw, const u8 *mac_addr, u8 flags,
                        struct ice_sq_cd *cd)
 {
        struct ice_aqc_manage_mac_write *cmd;
@@ -1697,8 +1697,8 @@ ice_aq_manage_mac_write(struct ice_hw *hw, u8 *mac_addr, u8 flags,
        cmd->flags = flags;
 
        /* Prep values for flags, sah, sal */
-       cmd->sah = htons(*((u16 *)mac_addr));
-       cmd->sal = htonl(*((u32 *)(mac_addr + 2)));
+       cmd->sah = htons(*((const u16 *)mac_addr));
+       cmd->sal = htonl(*((const u32 *)(mac_addr + 2)));
 
        return ice_aq_send_cmd(hw, &desc, NULL, 0, cd);
 }
index 17e21874b75b8f66b1369301ce3c407bc7cd5367..d7c7c2ed88234df8710593eed9e47d3aa7157ece 100644 (file)
@@ -75,7 +75,7 @@ void
 ice_update_phy_type(u64 *phy_type_low, u64 *phy_type_high,
                    u16 link_speeds_bitmap);
 enum ice_status
-ice_aq_manage_mac_write(struct ice_hw *hw, u8 *mac_addr, u8 flags,
+ice_aq_manage_mac_write(struct ice_hw *hw, const u8 *mac_addr, u8 flags,
                        struct ice_sq_cd *cd);
 enum ice_status ice_clear_pf_cfg(struct ice_hw *hw);
 enum ice_status