From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by dpdk.org (Postfix) with ESMTP id 6F994AFD3 for ; Tue, 24 Jun 2014 16:47:59 +0200 (CEST) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP; 24 Jun 2014 07:42:52 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.01,538,1400050800"; d="scan'208";a="533284403" Received: from irsmsx103.ger.corp.intel.com ([163.33.3.157]) by orsmga001.jf.intel.com with ESMTP; 24 Jun 2014 07:48:16 -0700 Received: from irsmsx105.ger.corp.intel.com ([169.254.7.76]) by IRSMSX103.ger.corp.intel.com ([169.254.3.31]) with mapi id 14.03.0123.003; Tue, 24 Jun 2014 15:46:56 +0100 From: "Ananyev, Konstantin" To: "De Lara Guarch, Pablo" , "dev@dpdk.org" Thread-Topic: [dpdk-dev] [PATCH] ixgbe: Alternative fix for 82599 Bypass NIC, getting incorrect media type Thread-Index: AQHPj7qTe0zQZr/9BE69WGiZHAS0tZuAVmIA Date: Tue, 24 Jun 2014 14:46:56 +0000 Message-ID: <2601191342CEEE43887BDE71AB97725821333FC2@IRSMSX105.ger.corp.intel.com> References: <1403620889-29179-1-git-send-email-pablox.de.lara.guarch@intel.com> In-Reply-To: <1403620889-29179-1-git-send-email-pablox.de.lara.guarch@intel.com> Accept-Language: en-IE, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [163.33.239.181] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [dpdk-dev] [PATCH] ixgbe: Alternative fix for 82599 Bypass NIC, getting incorrect media type X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Jun 2014 14:47:59 -0000 > This was previosly solved in commit 60a70d4e042350ca0f9200334b341063438be= 89b, > but this alternative fix solves the same issue, but without modifying > the ixgbe shared code. >=20 > Signed-off-by: Pablo de Lara > --- > lib/librte_pmd_ixgbe/ixgbe/ixgbe_82599.c | 3 -- > lib/librte_pmd_ixgbe/ixgbe_82599_bypass.c | 35 ++++++++++++++++++-----= ----- > 2 files changed, 22 insertions(+), 16 deletions(-) >=20 > diff --git a/lib/librte_pmd_ixgbe/ixgbe/ixgbe_82599.c b/lib/librte_pmd_ix= gbe/ixgbe/ixgbe_82599.c > index 93c4e35..ed97ad9 100644 > --- a/lib/librte_pmd_ixgbe/ixgbe/ixgbe_82599.c > +++ b/lib/librte_pmd_ixgbe/ixgbe/ixgbe_82599.c > @@ -537,9 +537,6 @@ enum ixgbe_media_type ixgbe_get_media_type_82599(stru= ct ixgbe_hw *hw) > case IXGBE_DEV_ID_82599_SFP_SF2: > case IXGBE_DEV_ID_82599_SFP_SF_QP: > case IXGBE_DEV_ID_82599EN_SFP: > -#ifdef RTE_NIC_BYPASS > - case IXGBE_DEV_ID_82599_BYPASS: > -#endif > media_type =3D ixgbe_media_type_fiber; > break; > case IXGBE_DEV_ID_82599_CX4: > diff --git a/lib/librte_pmd_ixgbe/ixgbe_82599_bypass.c b/lib/librte_pmd_i= xgbe/ixgbe_82599_bypass.c > index 27a5f70..6748ea4 100644 > --- a/lib/librte_pmd_ixgbe/ixgbe_82599_bypass.c > +++ b/lib/librte_pmd_ixgbe/ixgbe_82599_bypass.c > @@ -256,19 +256,6 @@ out: > return status; > } >=20 > -/* > - * Wrapper around ND functions to support BYPASS nic. > - */ > -s32 > -ixgbe_bypass_init_shared_code(struct ixgbe_hw *hw) > -{ > - if (hw->device_id =3D=3D IXGBE_DEV_ID_82599_BYPASS) { > - hw->mac.type =3D ixgbe_mac_82599EB; > - } > - > - return (ixgbe_init_shared_code(hw)); > -} > - > static enum ixgbe_media_type > ixgbe_bypass_get_media_type(struct ixgbe_hw *hw) > { > @@ -284,6 +271,28 @@ ixgbe_bypass_get_media_type(struct ixgbe_hw *hw) > return (media_type); > } >=20 > +/* > + * Wrapper around ND functions to support BYPASS nic. > + */ > +s32 > +ixgbe_bypass_init_shared_code(struct ixgbe_hw *hw) > +{ > + s32 ret_val; > + > + if (hw->device_id =3D=3D IXGBE_DEV_ID_82599_BYPASS) { > + hw->mac.type =3D ixgbe_mac_82599EB; > + } > + > + ret_val =3D ixgbe_init_shared_code(hw); > + if (hw->device_id =3D=3D IXGBE_DEV_ID_82599_BYPASS) { > + hw->mac.ops.get_media_type =3D &ixgbe_bypass_get_media_type; > + ixgbe_init_mac_link_ops_82599(hw); > + } > + > + return ret_val; > +} > + > + > s32 > ixgbe_bypass_init_hw(struct ixgbe_hw *hw) > { > -- Acked-by: Konstantin Ananyev