2013-03-24 06:10:46

by Kumar Amit Mehta

Subject: [PATCH v2] bnx2x: fix assignment of signed expression to unsigned variable

fix for incorrect assignment of signed expression to unsigned variable.

Signed-off-by: Kumar Amit Mehta <[email protected]>
---
drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c | 18 +++++++++---------
1 file 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 5682054..91ecd6a 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)
break;
default:
BNX2X_ERR("Non valid capability ID\n");
- rval = -EINVAL;
+ rval = 1;
break;
}
} else {
DP(BNX2X_MSG_DCB, "DCB disabled\n");
- rval = -EINVAL;
+ rval = 1;
}

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)
break;
default:
BNX2X_ERR("Non valid TC-ID\n");
- rval = -EINVAL;
+ rval = 1;
break;
}
} else {
DP(BNX2X_MSG_DCB, "DCB disabled\n");
- rval = -EINVAL;
+ rval = 1;
}

return rval;
@@ -2188,7 +2188,7 @@ static int bnx2x_dcbnl_set_numtcs(struct net_device *netdev, int tcid, u8 num)
return -EINVAL;
}

-static u8 bnx2x_dcbnl_get_pfc_state(struct net_device *netdev)
+static u8 bnx2x_dcbnl_get_pfc_state(struct net_device *netdev)
{
struct bnx2x *bp = netdev_priv(netdev);
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,
break;
default:
BNX2X_ERR("Non valid featrue-ID\n");
- rval = -EINVAL;
+ rval = 1;
break;
}
} else {
DP(BNX2X_MSG_DCB, "DCB disabled\n");
- rval = -EINVAL;
+ rval = 1;
}

return rval;
@@ -2431,12 +2431,12 @@ static u8 bnx2x_dcbnl_set_featcfg(struct net_device *netdev, int featid,
break;
default:
BNX2X_ERR("Non valid featrue-ID\n");
- rval = -EINVAL;
+ rval = 1;
break;
}
} else {
DP(BNX2X_MSG_DCB, "dcbnl call not valid\n");
- rval = -EINVAL;
+ rval = 1;
}

return rval;
--
1.7.9.5

2013-03-24 08:00:23

by Dmitry Kravkov

Subject: RE: [PATCH v2] bnx2x: fix assignment of signed expression to unsigned variable

> -----Original Message-----
> From: [email protected] [mailto:[email protected]] On Behalf Of Kumar Amit Mehta
> Sent: Sunday, March 24, 2013 8:10 AM
> To: Eilon Greenstein
> Cc: [email protected]; [email protected]; [email protected]; [email protected]; kernel-
> [email protected]
> Subject: [PATCH v2] bnx2x: fix assignment of signed expression to unsigned variable
>
> fix for incorrect assignment of signed expression to unsigned variable.
>
> Signed-off-by: Kumar Amit Mehta <[email protected]>
> ---
> drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c | 18 +++++++++---------
> 1 file 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 5682054..91ecd6a 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)
> break;
> default:
> BNX2X_ERR("Non valid capability ID\n");
> - rval = -EINVAL;
> + rval = 1;
> break;
> }
> } else {
> DP(BNX2X_MSG_DCB, "DCB disabled\n");
> - rval = -EINVAL;
> + rval = 1;
> }
>
> 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)
> break;
> default:
> BNX2X_ERR("Non valid TC-ID\n");
> - rval = -EINVAL;
> + rval = 1;
> break;
> }
> } else {
> DP(BNX2X_MSG_DCB, "DCB disabled\n");
> - rval = -EINVAL;
> + rval = 1;
> }
>
> return rval;
> @@ -2188,7 +2188,7 @@ static int bnx2x_dcbnl_set_numtcs(struct net_device *netdev, int tcid, u8 num)
> return -EINVAL;
> }
>
> -static u8 bnx2x_dcbnl_get_pfc_state(struct net_device *netdev)
> +static u8 bnx2x_dcbnl_get_pfc_state(struct net_device *netdev)
> {
> struct bnx2x *bp = netdev_priv(netdev);
> 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,
> break;
> default:
> BNX2X_ERR("Non valid featrue-ID\n");
> - rval = -EINVAL;
> + rval = 1;
> break;
> }
> } else {
> DP(BNX2X_MSG_DCB, "DCB disabled\n");
> - rval = -EINVAL;
> + rval = 1;
> }
>
> return rval;
> @@ -2431,12 +2431,12 @@ static u8 bnx2x_dcbnl_set_featcfg(struct net_device *netdev, int featid,
> break;
> default:
> BNX2X_ERR("Non valid featrue-ID\n");
> - rval = -EINVAL;
> + rval = 1;
> break;
> }
> } else {
> DP(BNX2X_MSG_DCB, "dcbnl call not valid\n");
> - rval = -EINVAL;
> + rval = 1;
> }
>
> return rval;
> --
> 1.7.9.5

Kumar, thanks!

Acked-by: Dmitry Kravkov <[email protected]>

2013-03-24 21:28:16

by David Miller

Subject: Re: [PATCH v2] bnx2x: fix assignment of signed expression to unsigned variable

From: Kumar Amit Mehta <[email protected]>
Date: Sat, 23 Mar 2013 23:10:25 -0700

> fix for incorrect assignment of signed expression to unsigned variable.
>
> Signed-off-by: Kumar Amit Mehta <[email protected]>

Applied.