fm10k: explicitly typecast vlan values to u16
authorJacob Keller <jacob.e.keller@intel.com>
Fri, 16 Oct 2015 17:57:01 +0000 (10:57 -0700)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Sun, 6 Dec 2015 07:55:17 +0000 (23:55 -0800)
Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Krishneil Singh <Krishneil.k.singh@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
drivers/net/ethernet/intel/fm10k/fm10k_pf.c

index b1e09756a6efe0cca980acd33691243321979d6e..00f7a29e734fb6ef4841925a64b1d2c8fa983016 100644 (file)
@@ -1212,7 +1212,7 @@ s32 fm10k_iov_msg_mac_vlan_pf(struct fm10k_hw *hw, u32 **results,
                set = !(vid & FM10K_VLAN_CLEAR);
                vid &= ~FM10K_VLAN_CLEAR;
 
-               err = fm10k_iov_select_vid(vf_info, vid);
+               err = fm10k_iov_select_vid(vf_info, (u16)vid);
                if (err < 0)
                        return err;
                else
@@ -1242,7 +1242,7 @@ s32 fm10k_iov_msg_mac_vlan_pf(struct fm10k_hw *hw, u32 **results,
                if (err < 0)
                        return err;
                else
-                       vlan = err;
+                       vlan = (u16)err;
 
                /* notify switch of request for new unicast address */
                err = hw->mac.ops.update_uc_addr(hw, vf_info->glort,
@@ -1268,7 +1268,7 @@ s32 fm10k_iov_msg_mac_vlan_pf(struct fm10k_hw *hw, u32 **results,
                if (err < 0)
                        return err;
                else
-                       vlan = err;
+                       vlan = (u16)err;
 
                /* notify switch of request for new multicast address */
                err = hw->mac.ops.update_mc_addr(hw, vf_info->glort,