]> www.infradead.org Git - users/jedix/linux-maple.git/commit
i40e: Fix bit logic error in failure case
authorDavid Ertman <david.m.ertman@intel.com>
Fri, 30 Sep 2016 08:36:21 +0000 (01:36 -0700)
committerDhaval Giani <dhaval.giani@oracle.com>
Wed, 8 Mar 2017 00:40:28 +0000 (19:40 -0500)
commitce805a646990896eed1607f9ac1e212641c9c79e
tree086bdd05bb7e03bbb87531b45aac909e0a99d23c
parent5f7dcaebfd91077e6550768255f183efc20f2112
i40e: Fix bit logic error in failure case

Orabug: 24568124

Patch a036244c0686 "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>
(cherry picked from commit c17ef430b9fd5f58074f5cdc0128d06a5ae92304)
Signed-off-by: Brian Maly <brian.maly@oracle.com>
Signed-off-by: Dhaval Giani <dhaval.giani@oracle.com>
drivers/net/ethernet/intel/i40e/i40e_main.c