From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: Emil Tantilov <emil.s.tantilov@intel.com>,
netdev@vger.kernel.org, gospo@redhat.com, sassmann@redhat.com,
Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Subject: [net-next v2 09/10] ixgbe: include QSFP PHY types in ixgbe_is_sfp()
Date: Thu, 29 Aug 2013 03:50:05 -0700 [thread overview]
Message-ID: <1377773406-24851-10-git-send-email-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <1377773406-24851-1-git-send-email-jeffrey.t.kirsher@intel.com>
From: Emil Tantilov <emil.s.tantilov@intel.com>
This patch makes sure that QSFP+ modules use the SFP+ code path for
setting up link.
Signed-off-by: Emil Tantilov <emil.s.tantilov@intel.com>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index 4688057..7aba452 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -4175,6 +4175,10 @@ static inline bool ixgbe_is_sfp(struct ixgbe_hw *hw)
case ixgbe_phy_sfp_passive_unknown:
case ixgbe_phy_sfp_active_unknown:
case ixgbe_phy_sfp_ftl_active:
+ case ixgbe_phy_qsfp_passive_unknown:
+ case ixgbe_phy_qsfp_active_unknown:
+ case ixgbe_phy_qsfp_intel:
+ case ixgbe_phy_qsfp_unknown:
return true;
case ixgbe_phy_nl:
if (hw->mac.type == ixgbe_mac_82598EB)
--
1.8.3.1
next prev parent reply other threads:[~2013-08-29 10:50 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-29 10:49 [net-next v2 00/10][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
2013-08-29 10:49 ` [net-next v2 01/10] ixgbe: disable link when adapter goes down Jeff Kirsher
2013-08-29 10:49 ` [net-next v2 02/10] ixgbe: Check return value on eeprom reads Jeff Kirsher
2013-08-29 10:49 ` [net-next v2 03/10] ixgbe: fix incorrect limit value in ring transverse Jeff Kirsher
2013-08-29 10:50 ` [net-next v2 04/10] ixgbe: fix link test when connected to 1Gbps link partner Jeff Kirsher
2013-08-29 10:50 ` [net-next v2 05/10] ixgbe: zero out mailbox buffer on init Jeff Kirsher
2013-08-29 10:50 ` [net-next v2 06/10] ixgbe: cleanup some log messages Jeff Kirsher
2013-08-29 10:50 ` [net-next v2 07/10] ixgbe: fix SFF data dumps of SFP+ modules from an offset Jeff Kirsher
2013-08-29 10:50 ` [net-next v2 08/10] ixgbe: add 1Gbps support for QSFP+ Jeff Kirsher
2013-08-29 10:50 ` Jeff Kirsher [this message]
2013-08-29 10:50 ` [net-next v2 10/10] ixgbe: add support for older QSFP active DA cables Jeff Kirsher
2013-08-29 20:14 ` [net-next v2 00/10][pull request] Intel Wired LAN Driver Updates David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1377773406-24851-10-git-send-email-jeffrey.t.kirsher@intel.com \
--to=jeffrey.t.kirsher@intel.com \
--cc=davem@davemloft.net \
--cc=emil.s.tantilov@intel.com \
--cc=gospo@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=sassmann@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).