diff options
| author | David S. Miller <davem@davemloft.net> | 2013-03-27 13:52:49 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-03-27 13:52:49 -0400 |
| commit | e2a553dbf18a5177fdebe29495c32a8e7fd3a4db (patch) | |
| tree | 5ccb3d498325a7aaf93f49549eca03cb7861ca1c /drivers/net/ethernet/broadcom/bnx2x | |
| parent | 7559d97993ae7d552c96313155286f372cf4cf7c (diff) | |
| parent | a8c45289f215e137825bf9630d0abb41c1dc41ff (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
include/net/ipip.h
The changes made to ipip.h in 'net' were already included
in 'net-next' before that header was moved to another location.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/broadcom/bnx2x')
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c index 568205436a15..91ecd6a00d05 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c | |||
| @@ -2139,12 +2139,12 @@ static u8 bnx2x_dcbnl_get_cap(struct net_device *netdev, int capid, u8 *cap) | |||
| 2139 | break; | 2139 | break; |
| 2140 | default: | 2140 | default: |
| 2141 | BNX2X_ERR("Non valid capability ID\n"); | 2141 | BNX2X_ERR("Non valid capability ID\n"); |
| 2142 | rval = -EINVAL; | 2142 | rval = 1; |
| 2143 | break; | 2143 | break; |
| 2144 | } | 2144 | } |
| 2145 | } else { | 2145 | } else { |
| 2146 | DP(BNX2X_MSG_DCB, "DCB disabled\n"); | 2146 | DP(BNX2X_MSG_DCB, "DCB disabled\n"); |
| 2147 | rval = -EINVAL; | 2147 | rval = 1; |
| 2148 | } | 2148 | } |
| 2149 | 2149 | ||
| 2150 | DP(BNX2X_MSG_DCB, "capid %d:%x\n", capid, *cap); | 2150 | DP(BNX2X_MSG_DCB, "capid %d:%x\n", capid, *cap); |
| @@ -2170,12 +2170,12 @@ static int bnx2x_dcbnl_get_numtcs(struct net_device *netdev, int tcid, u8 *num) | |||
| 2170 | break; | 2170 | break; |
| 2171 | default: | 2171 | default: |
| 2172 | BNX2X_ERR("Non valid TC-ID\n"); | 2172 | BNX2X_ERR("Non valid TC-ID\n"); |
| 2173 | rval = -EINVAL; | 2173 | rval = 1; |
| 2174 | break; | 2174 | break; |
| 2175 | } | 2175 | } |
| 2176 | } else { | 2176 | } else { |
| 2177 | DP(BNX2X_MSG_DCB, "DCB disabled\n"); | 2177 | DP(BNX2X_MSG_DCB, "DCB disabled\n"); |
| 2178 | rval = -EINVAL; | 2178 | rval = 1; |
| 2179 | } | 2179 | } |
| 2180 | 2180 | ||
| 2181 | return rval; | 2181 | return rval; |
| @@ -2188,7 +2188,7 @@ static int bnx2x_dcbnl_set_numtcs(struct net_device *netdev, int tcid, u8 num) | |||
| 2188 | return -EINVAL; | 2188 | return -EINVAL; |
| 2189 | } | 2189 | } |
| 2190 | 2190 | ||
| 2191 | static u8 bnx2x_dcbnl_get_pfc_state(struct net_device *netdev) | 2191 | static u8 bnx2x_dcbnl_get_pfc_state(struct net_device *netdev) |
| 2192 | { | 2192 | { |
| 2193 | struct bnx2x *bp = netdev_priv(netdev); | 2193 | struct bnx2x *bp = netdev_priv(netdev); |
| 2194 | DP(BNX2X_MSG_DCB, "state = %d\n", bp->dcbx_local_feat.pfc.enabled); | 2194 | DP(BNX2X_MSG_DCB, "state = %d\n", bp->dcbx_local_feat.pfc.enabled); |
| @@ -2390,12 +2390,12 @@ static u8 bnx2x_dcbnl_get_featcfg(struct net_device *netdev, int featid, | |||
| 2390 | break; | 2390 | break; |
| 2391 | default: | 2391 | default: |
| 2392 | BNX2X_ERR("Non valid featrue-ID\n"); | 2392 | BNX2X_ERR("Non valid featrue-ID\n"); |
| 2393 | rval = -EINVAL; | 2393 | rval = 1; |
| 2394 | break; | 2394 | break; |
| 2395 | } | 2395 | } |
| 2396 | } else { | 2396 | } else { |
| 2397 | DP(BNX2X_MSG_DCB, "DCB disabled\n"); | 2397 | DP(BNX2X_MSG_DCB, "DCB disabled\n"); |
| 2398 | rval = -EINVAL; | 2398 | rval = 1; |
| 2399 | } | 2399 | } |
| 2400 | 2400 | ||
| 2401 | return rval; | 2401 | return rval; |
| @@ -2431,12 +2431,12 @@ static u8 bnx2x_dcbnl_set_featcfg(struct net_device *netdev, int featid, | |||
| 2431 | break; | 2431 | break; |
| 2432 | default: | 2432 | default: |
| 2433 | BNX2X_ERR("Non valid featrue-ID\n"); | 2433 | BNX2X_ERR("Non valid featrue-ID\n"); |
| 2434 | rval = -EINVAL; | 2434 | rval = 1; |
| 2435 | break; | 2435 | break; |
| 2436 | } | 2436 | } |
| 2437 | } else { | 2437 | } else { |
| 2438 | DP(BNX2X_MSG_DCB, "dcbnl call not valid\n"); | 2438 | DP(BNX2X_MSG_DCB, "dcbnl call not valid\n"); |
| 2439 | rval = -EINVAL; | 2439 | rval = 1; |
| 2440 | } | 2440 | } |
| 2441 | 2441 | ||
| 2442 | return rval; | 2442 | return rval; |