From 7b4b2080e7c7060154345e9e14f638400d764289 Mon Sep 17 00:00:00 2001 From: Alexander Duyck Date: Thu, 21 Jul 2011 00:40:51 +0000 Subject: [PATCH] --- yaml --- r: 265945 b: refs/heads/master c: 8917b447b75818823f4d0b7dc8cdd9248a4d5445 h: refs/heads/master i: 265943: 0133e5fdc0204878c0e6e4b8b4ee210a5e5a6926 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index ec618d59cd4b..5107031c4eea 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5fdd31f920a5ec8873929750d83ffa777bed6100 +refs/heads/master: 8917b447b75818823f4d0b7dc8cdd9248a4d5445 diff --git a/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c index 0533bc4033a6..ce59dc642c6f 100644 --- a/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c @@ -3451,6 +3451,9 @@ static inline bool ixgbe_is_sfp(struct ixgbe_hw *hw) case ixgbe_phy_sfp_active_unknown: case ixgbe_phy_sfp_ftl_active: return true; + case ixgbe_phy_nl: + if (hw->mac.type == ixgbe_mac_82598EB) + return true; default: return false; }