Patchwork ixgbe: fix broken PPTP handling

login
register
mail settings
Submitter Alan Cox
Date Nov. 20, 2012, 4:32 p.m.
Message ID <20121120163227.11935.57062.stgit@bob.linux.org.uk>
Download mbox | patch
Permalink /patch/200392/
State Not Applicable
Delegated to: David Miller
Headers show

Comments

Alan Cox - Nov. 20, 2012, 4:32 p.m.
From: Alan Cox <alan@linux.intel.com>

Reported to the maintain 3 weeks ago so now sending a patch rather
than waiting. ixgbe passes a random event type to the pptp code

Signed-off-by: Alan Cox <alan@linux.intel.com>
---

 drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c |    1 +
 1 file changed, 1 insertion(+)



--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Vick, Matthew - Nov. 20, 2012, 5:12 p.m.
> -----Original Message-----

> From: netdev-owner@vger.kernel.org [mailto:netdev-

> owner@vger.kernel.org] On Behalf Of Alan Cox

> Sent: Tuesday, November 20, 2012 8:33 AM

> To: netdev@vger.kernel.org

> Subject: [PATCH] ixgbe: fix broken PPTP handling

> 

> From: Alan Cox <alan@linux.intel.com>

> 

> Reported to the maintain 3 weeks ago so now sending a patch rather than

> waiting. ixgbe passes a random event type to the pptp code

> 

> Signed-off-by: Alan Cox <alan@linux.intel.com>

> ---

> 

>  drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c |    1 +

>  1 file changed, 1 insertion(+)

> 

> 

> diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c

> b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c

> index 01d99af..73291fe 100644

> --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c

> +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c

> @@ -398,6 +398,7 @@ void ixgbe_ptp_check_pps_event(struct ixgbe_adapter

> *adapter, u32 eicr)

> 

>  	switch (hw->mac.type) {

>  	case ixgbe_mac_X540:

> +		event.type = PTP_CLOCK_PPS;

>  		ptp_clock_event(adapter->ptp_clock, &event);

>  		break;

>  	default:


CCing e1000-devel, the mailing list for Intel Wired Ethernet support.

Sorry, Alan--I didn't see any message from you about this before or I would have responded. NAK on this, since I don't see how ixgbe is passing a random event type. The event type gets set to PTP_CLOCK_PPS just a few lines above (before the if (!adapter->ptp_clock) block).

Matthew
Keller, Jacob E - Nov. 20, 2012, 5:27 p.m.
> -----Original Message-----

> From: netdev-owner@vger.kernel.org [mailto:netdev-owner@vger.kernel.org]

> On Behalf Of Vick, Matthew

> Sent: Tuesday, November 20, 2012 9:12 AM

> To: Alan Cox; netdev@vger.kernel.org

> Cc: e1000-devel@lists.sourceforge.net

> Subject: RE: [PATCH] ixgbe: fix broken PPTP handling

> 

> > -----Original Message-----

> > From: netdev-owner@vger.kernel.org [mailto:netdev-

> > owner@vger.kernel.org] On Behalf Of Alan Cox

> > Sent: Tuesday, November 20, 2012 8:33 AM

> > To: netdev@vger.kernel.org

> > Subject: [PATCH] ixgbe: fix broken PPTP handling

> >

> > From: Alan Cox <alan@linux.intel.com>

> >

> > Reported to the maintain 3 weeks ago so now sending a patch rather than

> > waiting. ixgbe passes a random event type to the pptp code

> >

> > Signed-off-by: Alan Cox <alan@linux.intel.com>

> > ---

> >

> >  drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c |    1 +

> >  1 file changed, 1 insertion(+)

> >

> >

> > diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c

> > b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c

> > index 01d99af..73291fe 100644

> > --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c

> > +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c

> > @@ -398,6 +398,7 @@ void ixgbe_ptp_check_pps_event(struct ixgbe_adapter

> > *adapter, u32 eicr)

> >

> >  	switch (hw->mac.type) {

> >  	case ixgbe_mac_X540:

> > +		event.type = PTP_CLOCK_PPS;

> >  		ptp_clock_event(adapter->ptp_clock, &event);

> >  		break;

> >  	default:

> 

> CCing e1000-devel, the mailing list for Intel Wired Ethernet support.

> 

> Sorry, Alan--I didn't see any message from you about this before or I

> would have responded. NAK on this, since I don't see how ixgbe is passing

> a random event type. The event type gets set to PTP_CLOCK_PPS just a few

> lines above (before the if (!adapter->ptp_clock) block).

> 

> Matthew


Specifically, commit 3645adbb "ixgbe: fix uninitialized event.type in ixgbe_ptp_check_pps_event"

:)

Sorry I didn't reply directly to your original email with the concern, or CC you. I will do so next time.

Thanks

- Jake
Alan Cox - Nov. 20, 2012, 5:56 p.m.
> Specifically, commit 3645adbb "ixgbe: fix uninitialized event.type in ixgbe_ptp_check_pps_event"
> 
> :)
> 
> Sorry I didn't reply directly to your original email with the concern, or CC you. I will do so next time.

No problem - I missed the fact it was fixed with a different
non-overlapped patch.

Alan
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
index 01d99af..73291fe 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
@@ -398,6 +398,7 @@  void ixgbe_ptp_check_pps_event(struct ixgbe_adapter *adapter, u32 eicr)
 
 	switch (hw->mac.type) {
 	case ixgbe_mac_X540:
+		event.type = PTP_CLOCK_PPS;
 		ptp_clock_event(adapter->ptp_clock, &event);
 		break;
 	default: