Commit c17ef430 authored Sep 30, 2016 by David Ertman Committed by Jeff Kirsher Oct 28, 2016

i40e: Fix bit logic error in failure case



Patch a036244c "i40e: Fix kernel panic on enable/disable LLDP"
introduced an error in bit logic.

Originally this bit manipulation was meant to clear two bits to indicate
that DCB was not enabled or capable. An "&" was incorrectly used instead
of an "|" bit operator to combine the two bitmasks into one.  This also
created a static checker error since the resultant code was a no-op.

This patch fixes the error by using the correct bit-wise operator.

Signed-off-by: Dave Ertman <david.m.ertman@intel.com>
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

parent cf465fe7

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -10970,7 +10970,7 @@ static int i40e_probe(struct pci_dev pdev, const struct pci_device_id ent)
	err = i40e_init_pf_dcb(pf);		err = i40e_init_pf_dcb(pf);
	if (err) {		if (err) {
	dev_info(&pdev->dev, "DCB init failed %d, disabled\n", err);		dev_info(&pdev->dev, "DCB init failed %d, disabled\n", err);
	pf->flags &= ~(I40E_FLAG_DCB_CAPABLE & I40E_FLAG_DCB_ENABLED);		pf->flags &= ~(I40E_FLAG_DCB_CAPABLE \| I40E_FLAG_DCB_ENABLED);
	/* Continue without DCB enabled */		/* Continue without DCB enabled */
	}		}
	#endif /* CONFIG_I40E_DCB */		#endif /* CONFIG_I40E_DCB */