* [PATCH] ixgbe: Alternative fix for 82599 Bypass NIC, getting incorrect media type
@ 2014-06-24 14:41 Pablo de Lara
[not found] ` <1403620889-29179-1-git-send-email-pablox.de.lara.guarch-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
0 siblings, 1 reply; 6+ messages in thread
From: Pablo de Lara @ 2014-06-24 14:41 UTC (permalink / raw)
To: dev-VfR2kkLFssw
From: Pablo de Lara <pablo.de.lara.guarch-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
This was previosly solved in commit 60a70d4e042350ca0f9200334b341063438be89b,
but this alternative fix solves the same issue, but without modifying
the ixgbe shared code.
Signed-off-by: Pablo de Lara <pablo.de.lara.guarch-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
---
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(-)
diff --git a/lib/librte_pmd_ixgbe/ixgbe/ixgbe_82599.c b/lib/librte_pmd_ixgbe/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(struct 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 = 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_ixgbe/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;
}
-/*
- * Wrapper around ND functions to support BYPASS nic.
- */
-s32
-ixgbe_bypass_init_shared_code(struct ixgbe_hw *hw)
-{
- if (hw->device_id == IXGBE_DEV_ID_82599_BYPASS) {
- hw->mac.type = 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);
}
+/*
+ * 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 == IXGBE_DEV_ID_82599_BYPASS) {
+ hw->mac.type = ixgbe_mac_82599EB;
+ }
+
+ ret_val = ixgbe_init_shared_code(hw);
+ if (hw->device_id == IXGBE_DEV_ID_82599_BYPASS) {
+ hw->mac.ops.get_media_type = &ixgbe_bypass_get_media_type;
+ ixgbe_init_mac_link_ops_82599(hw);
+ }
+
+ return ret_val;
+}
+
+
s32
ixgbe_bypass_init_hw(struct ixgbe_hw *hw)
{
--
1.7.0.7
^ permalink raw reply related [flat|nested] 6+ messages in thread[parent not found: <1403620889-29179-1-git-send-email-pablox.de.lara.guarch-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>]
* Re: [PATCH] ixgbe: Alternative fix for 82599 Bypass NIC, getting incorrect media type [not found] ` <1403620889-29179-1-git-send-email-pablox.de.lara.guarch-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org> @ 2014-06-24 14:46 ` Ananyev, Konstantin [not found] ` <2601191342CEEE43887BDE71AB97725821333FC2-kPTMFJFq+rEu0RiL9chJVbfspsVTdybXVpNB7YpNyf8@public.gmane.org> 0 siblings, 1 reply; 6+ messages in thread From: Ananyev, Konstantin @ 2014-06-24 14:46 UTC (permalink / raw) To: De Lara Guarch, Pablo, dev-VfR2kkLFssw@public.gmane.org > This was previosly solved in commit 60a70d4e042350ca0f9200334b341063438be89b, > but this alternative fix solves the same issue, but without modifying > the ixgbe shared code. > > Signed-off-by: Pablo de Lara <pablo.de.lara.guarch-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org> > --- > 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(-) > > diff --git a/lib/librte_pmd_ixgbe/ixgbe/ixgbe_82599.c b/lib/librte_pmd_ixgbe/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(struct 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 = 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_ixgbe/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; > } > > -/* > - * Wrapper around ND functions to support BYPASS nic. > - */ > -s32 > -ixgbe_bypass_init_shared_code(struct ixgbe_hw *hw) > -{ > - if (hw->device_id == IXGBE_DEV_ID_82599_BYPASS) { > - hw->mac.type = 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); > } > > +/* > + * 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 == IXGBE_DEV_ID_82599_BYPASS) { > + hw->mac.type = ixgbe_mac_82599EB; > + } > + > + ret_val = ixgbe_init_shared_code(hw); > + if (hw->device_id == IXGBE_DEV_ID_82599_BYPASS) { > + hw->mac.ops.get_media_type = &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 <konstantin.ananyev-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org> ^ permalink raw reply [flat|nested] 6+ messages in thread
[parent not found: <2601191342CEEE43887BDE71AB97725821333FC2-kPTMFJFq+rEu0RiL9chJVbfspsVTdybXVpNB7YpNyf8@public.gmane.org>]
* Re: [PATCH] ixgbe: Alternative fix for 82599 Bypass NIC, getting incorrect media type [not found] ` <2601191342CEEE43887BDE71AB97725821333FC2-kPTMFJFq+rEu0RiL9chJVbfspsVTdybXVpNB7YpNyf8@public.gmane.org> @ 2014-06-24 15:22 ` Zhang, Helin [not found] ` <F35DEAC7BCE34641BA9FAC6BCA4A12E70A74683D-0J0gbvR4kTg/UvCtAeCM4rfspsVTdybXVpNB7YpNyf8@public.gmane.org> 2014-06-26 12:24 ` Thomas Monjalon 1 sibling, 1 reply; 6+ messages in thread From: Zhang, Helin @ 2014-06-24 15:22 UTC (permalink / raw) To: Ananyev, Konstantin, De Lara Guarch, Pablo Cc: dev-VfR2kkLFssw@public.gmane.org -----Original Message----- From: dev [mailto:dev-bounces-VfR2kkLFssw@public.gmane.org] On Behalf Of Ananyev, Konstantin Sent: Tuesday, June 24, 2014 10:47 PM To: De Lara Guarch, Pablo; dev-VfR2kkLFssw@public.gmane.org Subject: Re: [dpdk-dev] [PATCH] ixgbe: Alternative fix for 82599 Bypass NIC, getting incorrect media type > This was previosly solved in commit > 60a70d4e042350ca0f9200334b341063438be89b, > but this alternative fix solves the same issue, but without modifying > the ixgbe shared code. > > Signed-off-by: Pablo de Lara <pablo.de.lara.guarch-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org> > --- > 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(-) > > diff --git a/lib/librte_pmd_ixgbe/ixgbe/ixgbe_82599.c > b/lib/librte_pmd_ixgbe/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(struct 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 = 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_ixgbe/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; > } > > -/* > - * Wrapper around ND functions to support BYPASS nic. > - */ > -s32 > -ixgbe_bypass_init_shared_code(struct ixgbe_hw *hw) -{ > - if (hw->device_id == IXGBE_DEV_ID_82599_BYPASS) { > - hw->mac.type = 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); > } > > +/* > + * 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 == IXGBE_DEV_ID_82599_BYPASS) { > + hw->mac.type = ixgbe_mac_82599EB; > + } > + > + ret_val = ixgbe_init_shared_code(hw); > + if (hw->device_id == IXGBE_DEV_ID_82599_BYPASS) { > + hw->mac.ops.get_media_type = &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 <konstantin.ananyev-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org> -------------------------------------------------------------------------------------------------------- Hi Pablo It seems that you modified ixgbe_82599.c. Do we really need to do that modification in ixgbe_82599.c? Generally we try to avoid doing that. Regards, Helin ^ permalink raw reply [flat|nested] 6+ messages in thread
[parent not found: <F35DEAC7BCE34641BA9FAC6BCA4A12E70A74683D-0J0gbvR4kTg/UvCtAeCM4rfspsVTdybXVpNB7YpNyf8@public.gmane.org>]
* Re: [PATCH] ixgbe: Alternative fix for 82599 Bypass NIC, getting incorrect media type [not found] ` <F35DEAC7BCE34641BA9FAC6BCA4A12E70A74683D-0J0gbvR4kTg/UvCtAeCM4rfspsVTdybXVpNB7YpNyf8@public.gmane.org> @ 2014-06-24 15:30 ` Ananyev, Konstantin [not found] ` <2601191342CEEE43887BDE71AB9772582133403A-kPTMFJFq+rEu0RiL9chJVbfspsVTdybXVpNB7YpNyf8@public.gmane.org> 0 siblings, 1 reply; 6+ messages in thread From: Ananyev, Konstantin @ 2014-06-24 15:30 UTC (permalink / raw) To: Zhang, Helin, De Lara Guarch, Pablo; +Cc: dev-VfR2kkLFssw@public.gmane.org Hi Helin, > -----Original Message----- > From: Zhang, Helin > Sent: Tuesday, June 24, 2014 4:23 PM > To: Ananyev, Konstantin; De Lara Guarch, Pablo > Cc: dev-VfR2kkLFssw@public.gmane.org > Subject: RE: [dpdk-dev] [PATCH] ixgbe: Alternative fix for 82599 Bypass NIC, getting incorrect media type > > -----Original Message----- > From: dev [mailto:dev-bounces-VfR2kkLFssw@public.gmane.org] On Behalf Of Ananyev, Konstantin > Sent: Tuesday, June 24, 2014 10:47 PM > To: De Lara Guarch, Pablo; dev-VfR2kkLFssw@public.gmane.org > Subject: Re: [dpdk-dev] [PATCH] ixgbe: Alternative fix for 82599 Bypass NIC, getting incorrect media type > > > > This was previosly solved in commit > > 60a70d4e042350ca0f9200334b341063438be89b, > > but this alternative fix solves the same issue, but without modifying > > the ixgbe shared code. > > > > Signed-off-by: Pablo de Lara <pablo.de.lara.guarch-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org> > > --- > > 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(-) > > > > diff --git a/lib/librte_pmd_ixgbe/ixgbe/ixgbe_82599.c > > b/lib/librte_pmd_ixgbe/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(struct 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 = 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_ixgbe/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; > > } > > > > -/* > > - * Wrapper around ND functions to support BYPASS nic. > > - */ > > -s32 > > -ixgbe_bypass_init_shared_code(struct ixgbe_hw *hw) -{ > > - if (hw->device_id == IXGBE_DEV_ID_82599_BYPASS) { > > - hw->mac.type = 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); > > } > > > > +/* > > + * 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 == IXGBE_DEV_ID_82599_BYPASS) { > > + hw->mac.type = ixgbe_mac_82599EB; > > + } > > + > > + ret_val = ixgbe_init_shared_code(hw); > > + if (hw->device_id == IXGBE_DEV_ID_82599_BYPASS) { > > + hw->mac.ops.get_media_type = &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 <konstantin.ananyev-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org> > > -------------------------------------------------------------------------------------------------------- > > Hi Pablo > > It seems that you modified ixgbe_82599.c. Do we really need to do that modification in ixgbe_82599.c? Generally we try to avoid doing > that. > > Regards, > Helin Actually that's the purpose of that patch: fix the problem without modifying shared code. So he removing previous modifications in the shared code. Konstantin ^ permalink raw reply [flat|nested] 6+ messages in thread
[parent not found: <2601191342CEEE43887BDE71AB9772582133403A-kPTMFJFq+rEu0RiL9chJVbfspsVTdybXVpNB7YpNyf8@public.gmane.org>]
* Re: [PATCH] ixgbe: Alternative fix for 82599 Bypass NIC, getting incorrect media type [not found] ` <2601191342CEEE43887BDE71AB9772582133403A-kPTMFJFq+rEu0RiL9chJVbfspsVTdybXVpNB7YpNyf8@public.gmane.org> @ 2014-06-24 15:34 ` Zhang, Helin 0 siblings, 0 replies; 6+ messages in thread From: Zhang, Helin @ 2014-06-24 15:34 UTC (permalink / raw) To: Ananyev, Konstantin, De Lara Guarch, Pablo Cc: dev-VfR2kkLFssw@public.gmane.org -----Original Message----- From: Ananyev, Konstantin Sent: Tuesday, June 24, 2014 11:31 PM To: Zhang, Helin; De Lara Guarch, Pablo Cc: dev-VfR2kkLFssw@public.gmane.org Subject: RE: [dpdk-dev] [PATCH] ixgbe: Alternative fix for 82599 Bypass NIC, getting incorrect media type Hi Helin, > -----Original Message----- > From: Zhang, Helin > Sent: Tuesday, June 24, 2014 4:23 PM > To: Ananyev, Konstantin; De Lara Guarch, Pablo > Cc: dev-VfR2kkLFssw@public.gmane.org > Subject: RE: [dpdk-dev] [PATCH] ixgbe: Alternative fix for 82599 > Bypass NIC, getting incorrect media type > > -----Original Message----- > From: dev [mailto:dev-bounces-VfR2kkLFssw@public.gmane.org] On Behalf Of Ananyev, > Konstantin > Sent: Tuesday, June 24, 2014 10:47 PM > To: De Lara Guarch, Pablo; dev-VfR2kkLFssw@public.gmane.org > Subject: Re: [dpdk-dev] [PATCH] ixgbe: Alternative fix for 82599 > Bypass NIC, getting incorrect media type > > > > This was previosly solved in commit > > 60a70d4e042350ca0f9200334b341063438be89b, > > but this alternative fix solves the same issue, but without > > modifying the ixgbe shared code. > > > > Signed-off-by: Pablo de Lara <pablo.de.lara.guarch-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org> > > --- > > 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(-) > > > > diff --git a/lib/librte_pmd_ixgbe/ixgbe/ixgbe_82599.c > > b/lib/librte_pmd_ixgbe/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(struct 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 = 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_ixgbe/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; > > } > > > > -/* > > - * Wrapper around ND functions to support BYPASS nic. > > - */ > > -s32 > > -ixgbe_bypass_init_shared_code(struct ixgbe_hw *hw) -{ > > - if (hw->device_id == IXGBE_DEV_ID_82599_BYPASS) { > > - hw->mac.type = 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); > > } > > > > +/* > > + * 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 == IXGBE_DEV_ID_82599_BYPASS) { > > + hw->mac.type = ixgbe_mac_82599EB; > > + } > > + > > + ret_val = ixgbe_init_shared_code(hw); > > + if (hw->device_id == IXGBE_DEV_ID_82599_BYPASS) { > > + hw->mac.ops.get_media_type = &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 <konstantin.ananyev-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org> > > ---------------------------------------------------------------------- > ---------------------------------- > > Hi Pablo > > It seems that you modified ixgbe_82599.c. Do we really need to do that > modification in ixgbe_82599.c? Generally we try to avoid doing that. > > Regards, > Helin Actually that's the purpose of that patch: fix the problem without modifying shared code. So he removing previous modifications in the shared code. Konstantin ---------------------------------------------------------------------------------------------------------------------------------- Hi Konstantin OK. I got it. It is a roll-back. Thanks! Regards, Helin ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] ixgbe: Alternative fix for 82599 Bypass NIC, getting incorrect media type [not found] ` <2601191342CEEE43887BDE71AB97725821333FC2-kPTMFJFq+rEu0RiL9chJVbfspsVTdybXVpNB7YpNyf8@public.gmane.org> 2014-06-24 15:22 ` Zhang, Helin @ 2014-06-26 12:24 ` Thomas Monjalon 1 sibling, 0 replies; 6+ messages in thread From: Thomas Monjalon @ 2014-06-26 12:24 UTC (permalink / raw) To: De Lara Guarch, Pablo; +Cc: dev-VfR2kkLFssw > > This was previosly solved in commit > > 60a70d4e042350ca0f9200334b341063438be89b, but this alternative fix solves > > the same issue, but without modifying the ixgbe shared code. > > > > Signed-off-by: Pablo de Lara <pablo.de.lara.guarch-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org> > > Acked-by: Konstantin Ananyev <konstantin.ananyev-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org> Applied for version 1.7.0. Thanks -- Thomas ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-06-26 12:24 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-06-24 14:41 [PATCH] ixgbe: Alternative fix for 82599 Bypass NIC, getting incorrect media type Pablo de Lara
[not found] ` <1403620889-29179-1-git-send-email-pablox.de.lara.guarch-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2014-06-24 14:46 ` Ananyev, Konstantin
[not found] ` <2601191342CEEE43887BDE71AB97725821333FC2-kPTMFJFq+rEu0RiL9chJVbfspsVTdybXVpNB7YpNyf8@public.gmane.org>
2014-06-24 15:22 ` Zhang, Helin
[not found] ` <F35DEAC7BCE34641BA9FAC6BCA4A12E70A74683D-0J0gbvR4kTg/UvCtAeCM4rfspsVTdybXVpNB7YpNyf8@public.gmane.org>
2014-06-24 15:30 ` Ananyev, Konstantin
[not found] ` <2601191342CEEE43887BDE71AB9772582133403A-kPTMFJFq+rEu0RiL9chJVbfspsVTdybXVpNB7YpNyf8@public.gmane.org>
2014-06-24 15:34 ` Zhang, Helin
2014-06-26 12:24 ` Thomas Monjalon
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).