ixgbe: prefix Data Center Bridge ops struct

PATCH New Stephen Hemminger 2 participants 2 messages Nov 21, 2016 – Dec 8, 2016

Subsystems (2)

Network drivers Intel Ethernet

lore

Share & tools

lore

Stephen Hemminger

author

2016-11-21 17:52 UTC #0 lore raw

PATCH 1/1 ixgbe: prefix Data Center Bridge ops struct

From: Stephen Hemminger <[email protected]>

Since dcbnl_ops is global, it should be prefixed by ixgbe_

Signed-off-by Stephen Hemminger <[email protected]>

---
 drivers/net/ethernet/intel/ixgbe/ixgbe.h        | 2 +-
 drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c | 2 +-
 drivers/net/ethernet/intel/ixgbe/ixgbe_main.c   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

drivers/net/ethernet/intel/ixgbe/ixgbe.h +1 -1

index ef81c3d..af8c43d 100644
@@ -871,7 +871,7 @@ extern const struct ixgbe_info ixgbe_X550_info;
 extern const struct ixgbe_info ixgbe_X550EM_x_info;
 extern const struct ixgbe_info ixgbe_x550em_a_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

index b8fc3cf..78c5237 100644
@@ -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

index 2436984..a3dd790 100644
@@ -9669,7 +9669,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

Signature · 1 line

2.7.4

Bowers

2016-12-08 17:36 UTC #1 lore raw

PATCH 1/1 ixgbe: prefix Data Center Bridge ops struct

Quoted 11 lines

-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On Behalf Of Stephen Hemminger
Sent: Monday, November 21, 2016 9:53 AM
To: Kirsher, Jeffrey T <[email protected]>
Cc: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [PATCH net-next] ixgbe: prefix Data Center Bridge ops struct
From: Stephen Hemminger <[email protected]>

Quoted 8 lines

Since dcbnl_ops is global, it should be prefixed by ixgbe_
Signed-off-by Stephen Hemminger <[email protected]>
---
 drivers/net/ethernet/intel/ixgbe/ixgbe.h        | 2 +-
 drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c | 2 +-
 drivers/net/ethernet/intel/ixgbe/ixgbe_main.c   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

Tested-by Andrew Bowers <[email protected]>