Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ecbb44e8 authored by Mitch Williams's avatar Mitch Williams Committed by Jeff Kirsher
Browse files

i40e: don't degrade __le16 



Sparse cries when we compare an __le16 to a u16, almost like it cares
about architectures other than x86. Weird. Use the le16_to_cpu macro to
make it stop crying.

Change-ID: Id068f4d7868a2d3df234a791a76d15938f37db35
Signed-off-by: default avatarMitch Williams <mitch.a.williams@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 8c5bbe77

drivers/net/ethernet/intel/i40e/i40e_main.c

+2 −0
Original line number Diff line number Diff line
@@ -1255,6 +1255,8 @@ struct i40e_mac_filter *i40e_put_mac_in_vlan(struct i40e_vsi *vsi, u8 *macaddr, 
	struct i40e_mac_filter *f;



	list_for_each_entry(f, &vsi->mac_filter_list, list) {

		if (vsi->info.pvid)

			f->vlan = le16_to_cpu(vsi->info.pvid);

		if (!i40e_find_filter(vsi, macaddr, f->vlan,

				      is_vf, is_netdev)) {

			if (!i40e_add_filter(vsi, macaddr, f->vlan,

drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c

+3 −2
Original line number Diff line number Diff line
@@ -2106,11 +2106,12 @@ int i40e_ndo_set_vf_port_vlan(struct net_device *netdev, 
		goto error_pvid;

	}



	if (vsi->info.pvid == (vlan_id | (qos << I40E_VLAN_PRIORITY_SHIFT)))

	if (le16_to_cpu(vsi->info.pvid) ==

	    (vlan_id | (qos << I40E_VLAN_PRIORITY_SHIFT)))

		/* duplicate request, so just return success */

		goto error_pvid;



	if (vsi->info.pvid == 0 && i40e_is_vsi_in_vlan(vsi)) {

	if (le16_to_cpu(vsi->info.pvid) == 0 && i40e_is_vsi_in_vlan(vsi)) {

		dev_err(&pf->pdev->dev,

			"VF %d has already configured VLAN filters and the administrator is requesting a port VLAN override.\nPlease unload and reload the VF driver for this change to take effect.\n",

			vf_id);