From fa76b7ed106189fb00502df38772bd1745ee6df5 Mon Sep 17 00:00:00 2001 From: Yaniv Rosner Date: Mon, 28 Nov 2011 00:49:50 +0000 Subject: [PATCH] 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 Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller Signed-off-by: Joe Jin --- drivers/net/bnx2x/bnx2x_link.c | 4 ++++ 1 file changed, 4 insertions(+) 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; } -- 2.50.1