From: Yaniv Rosner <yanivr@broadcom.com>
Date: Mon, 28 Nov 2011 00:49:50 +0000 (+0000)
Subject: bnx2x: Add known PHY type check
X-Git-Tag: v2.6.39-400.9.0~423^2~19^2~11^2~531
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=fa76b7ed106189fb00502df38772bd1745ee6df5;p=users%2Fjedix%2Flinux-maple.git

bnx2x: Add known PHY type check

The populate function will fail in case an unknown external PHY is detected.

(cherry picked from commit 6db5193b29642ab18e6343c8fcbc3417d6e80983)
Signed-off-by: Yaniv Rosner <yanivr@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Joe Jin <joe.jin@oracle.com>
---

diff --git a/drivers/net/bnx2x/bnx2x_link.c b/drivers/net/bnx2x/bnx2x_link.c
index 7fa7177fa6033..0e3c8950a6c8c 100644
--- a/drivers/net/bnx2x/bnx2x_link.c
+++ b/drivers/net/bnx2x/bnx2x_link.c
@@ -11483,6 +11483,10 @@ static int bnx2x_populate_ext_phy(struct bnx2x *bp,
 		return -EINVAL;
 	default:
 		*phy = phy_null;
+		/* In case external PHY wasn't found */
+		if ((phy_type != PORT_HW_CFG_XGXS_EXT_PHY_TYPE_DIRECT) &&
+		    (phy_type != PORT_HW_CFG_XGXS_EXT_PHY_TYPE_NOT_CONN))
+			return -EINVAL;
 		return 0;
 	}