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

Commit 3f40c74c authored by Stephen Hemminger's avatar Stephen Hemminger Committed by Jeff Kirsher
Browse files

ixgbe: prefix Data Center Bridge ops struct 



Since dcbnl_ops is global, it should be prefixed by ixgbe_

Signed-off-by: default avatarStephen Hemminger <sthemmin@microsoft.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 1dc0eb75

drivers/net/ethernet/intel/ixgbe/ixgbe.h

+1 −1
Original line number Diff line number Diff line
@@ -751,7 +751,7 @@ extern const struct ixgbe_info ixgbe_X550EM_x_info; 
extern const struct ixgbe_info ixgbe_x550em_a_info;

extern const struct ixgbe_info ixgbe_x550em_a_fw_info;

#ifdef CONFIG_IXGBE_DCB

extern const struct dcbnl_rtnl_ops dcbnl_ops;

extern const struct dcbnl_rtnl_ops ixgbe_dcbnl_ops;

#endif



extern char ixgbe_driver_name[];

drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c

+1 −1
Original line number Diff line number Diff line
@@ -777,7 +777,7 @@ static u8 ixgbe_dcbnl_setdcbx(struct net_device *dev, u8 mode) 
	return err ? 1 : 0;

}



const struct dcbnl_rtnl_ops dcbnl_ops = {

const struct dcbnl_rtnl_ops ixgbe_dcbnl_ops = {

	.ieee_getets	= ixgbe_dcbnl_ieee_getets,

	.ieee_setets	= ixgbe_dcbnl_ieee_setets,

	.ieee_getpfc	= ixgbe_dcbnl_ieee_getpfc,

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

+1 −1
Original line number Diff line number Diff line
@@ -9687,7 +9687,7 @@ static int ixgbe_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 


#ifdef CONFIG_IXGBE_DCB

	if (adapter->flags & IXGBE_FLAG_DCB_CAPABLE)

		netdev->dcbnl_ops = &dcbnl_ops;

		netdev->dcbnl_ops = &ixgbe_dcbnl_ops;

#endif



#ifdef IXGBE_FCOE