diff options
-rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c | 4 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c | 4 | ||||
-rw-r--r-- | include/net/dcbnl.h | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c index 9a9bd3ab4793..9a4ed05bb30a 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c | |||
@@ -2142,7 +2142,7 @@ static u8 bnx2x_dcbnl_get_cap(struct net_device *netdev, int capid, u8 *cap) | |||
2142 | return rval; | 2142 | return rval; |
2143 | } | 2143 | } |
2144 | 2144 | ||
2145 | static u8 bnx2x_dcbnl_get_numtcs(struct net_device *netdev, int tcid, u8 *num) | 2145 | static int bnx2x_dcbnl_get_numtcs(struct net_device *netdev, int tcid, u8 *num) |
2146 | { | 2146 | { |
2147 | struct bnx2x *bp = netdev_priv(netdev); | 2147 | struct bnx2x *bp = netdev_priv(netdev); |
2148 | u8 rval = 0; | 2148 | u8 rval = 0; |
@@ -2169,7 +2169,7 @@ static u8 bnx2x_dcbnl_get_numtcs(struct net_device *netdev, int tcid, u8 *num) | |||
2169 | return rval; | 2169 | return rval; |
2170 | } | 2170 | } |
2171 | 2171 | ||
2172 | static u8 bnx2x_dcbnl_set_numtcs(struct net_device *netdev, int tcid, u8 num) | 2172 | static int bnx2x_dcbnl_set_numtcs(struct net_device *netdev, int tcid, u8 num) |
2173 | { | 2173 | { |
2174 | struct bnx2x *bp = netdev_priv(netdev); | 2174 | struct bnx2x *bp = netdev_priv(netdev); |
2175 | DP(NETIF_MSG_LINK, "num tcs = %d; Not supported\n", num); | 2175 | DP(NETIF_MSG_LINK, "num tcs = %d; Not supported\n", num); |
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c index 95e5d11bb555..dde65f951400 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c | |||
@@ -490,7 +490,7 @@ static u8 ixgbe_dcbnl_getcap(struct net_device *netdev, int capid, u8 *cap) | |||
490 | return 0; | 490 | return 0; |
491 | } | 491 | } |
492 | 492 | ||
493 | static u8 ixgbe_dcbnl_getnumtcs(struct net_device *netdev, int tcid, u8 *num) | 493 | static int ixgbe_dcbnl_getnumtcs(struct net_device *netdev, int tcid, u8 *num) |
494 | { | 494 | { |
495 | struct ixgbe_adapter *adapter = netdev_priv(netdev); | 495 | struct ixgbe_adapter *adapter = netdev_priv(netdev); |
496 | u8 rval = 0; | 496 | u8 rval = 0; |
@@ -514,7 +514,7 @@ static u8 ixgbe_dcbnl_getnumtcs(struct net_device *netdev, int tcid, u8 *num) | |||
514 | return rval; | 514 | return rval; |
515 | } | 515 | } |
516 | 516 | ||
517 | static u8 ixgbe_dcbnl_setnumtcs(struct net_device *netdev, int tcid, u8 num) | 517 | static int ixgbe_dcbnl_setnumtcs(struct net_device *netdev, int tcid, u8 num) |
518 | { | 518 | { |
519 | return -EINVAL; | 519 | return -EINVAL; |
520 | } | 520 | } |
diff --git a/include/net/dcbnl.h b/include/net/dcbnl.h index 2cd66d0be348..f55c980d8e23 100644 --- a/include/net/dcbnl.h +++ b/include/net/dcbnl.h | |||
@@ -72,8 +72,8 @@ struct dcbnl_rtnl_ops { | |||
72 | void (*getpfccfg)(struct net_device *, int, u8 *); | 72 | void (*getpfccfg)(struct net_device *, int, u8 *); |
73 | u8 (*setall)(struct net_device *); | 73 | u8 (*setall)(struct net_device *); |
74 | u8 (*getcap)(struct net_device *, int, u8 *); | 74 | u8 (*getcap)(struct net_device *, int, u8 *); |
75 | u8 (*getnumtcs)(struct net_device *, int, u8 *); | 75 | int (*getnumtcs)(struct net_device *, int, u8 *); |
76 | u8 (*setnumtcs)(struct net_device *, int, u8); | 76 | int (*setnumtcs)(struct net_device *, int, u8); |
77 | u8 (*getpfcstate)(struct net_device *); | 77 | u8 (*getpfcstate)(struct net_device *); |
78 | void (*setpfcstate)(struct net_device *, u8); | 78 | void (*setpfcstate)(struct net_device *, u8); |
79 | void (*getbcncfg)(struct net_device *, int, u32 *); | 79 | void (*getbcncfg)(struct net_device *, int, u32 *); |