[3.11.y.z extended stable] Patch "sfc: Stop/re-start PTP when stopping/starting the datapath." has been added to staging queue

Luis Henriques luis.henriques at canonical.com
Wed Jan 22 09:44:06 UTC 2014


On Tue, Jan 21, 2014 at 06:01:44PM +0000, Ben Hutchings wrote:
> On Tue, 2014-01-21 at 11:02 +0000, Luis Henriques wrote:
> [...]
> > --- a/drivers/net/ethernet/sfc/efx.c
> > +++ b/drivers/net/ethernet/sfc/efx.c
> > @@ -695,6 +695,8 @@ static void efx_start_datapath(struct efx_nic *efx)
> >  		WARN_ON(channel->rx_pkt_n_frags);
> >  	}
> > 
> > +	efx_ptp_start_datapath(efx);
> > +
> >  	if (netif_device_present(efx->net_dev))
> >  		netif_tx_wake_all_queues(efx->net_dev);
> >  }
> > @@ -730,6 +732,8 @@ static void efx_stop_datapath(struct efx_nic *efx)
> >  		}
> >  	}
> > 
> > +	efx_ptp_stop_datapath(efx);
> > +
> >  	efx_for_each_channel(channel, efx) {
> >  		/* RX packet processing is pipelined, so wait for the
> >  		 * NAPI handler to complete.  At least event queue 0
> [...]
> 
> I don't think it makes a whole lot of difference, but the call to
> efx_ptp_stop_datapath() belongs further up this function, just after the
> initial assertions.

I've checked these sfc patches against your backports but it looks like I
failed to spot this.  Thanks Ben, I'll fix this patch.

Cheers,
--
Luis




More information about the kernel-team mailing list