On Wed, 2015-09-23 at 10:58 -0700, David Miller wrote: > From: David Woodhouse <dw...@infradead.org> > Date: Wed, 23 Sep 2015 09:14:09 +0100 > > > But sure, for now I'll drop this from the series and I can try to > > convince you separately. > > Yes, let's discuss this independantly to the nice bug fixing > that's happening in the rest of this series.
Since you explicitly call them 'bug fixes'... I suppose the last patch
in the latest series (enabling the various offloads by default) isn't a
bug fix and should be held back for net-next.
I think I can live with pushing the rest for the net tree. Just to
recap, the series is:
8139cp: Do not re-enable RX interrupts in cp_tx_timeout()
8139cp: Fix tx_queued debug message to print correct slot numbers
8139cp: Fix TSO/scatter-gather descriptor setup
8139cp: Reduce duplicate csum/tso code in cp_start_xmit()
8139cp: Fix DMA unmapping of transmitted buffers
8139cp: Dump contents of descriptor ring on TX timeout
8139cp: Enable offload features by default
The penultimate patch is also not strictly a bug fix, but it's only
adding additional diagnostics to a code path which was already broken
until I fixed it anyway, so I can live with that in net although I'll
also be happy if you want to defer it.
The fourth patch which removes the three duplicate versions of the
csum/tso checks might also be deferrable but really, it's *also*
fixing the failure mode when we see an inappropriate CHECKSUM_PARTIAL
packet, and it's touching a code path which I've *also* fixed in this
patch set. So it might as well stay.
I can shuffle things around if you disagree, but assuming Francois
concurs I'd suggest merging patches 1-6 (or just pulling from
git://git.infradead.org/users/dwmw2/linux-8139cp.git fixes-only)
and then I'll resubmit the last patch some time later, after you
next pull net into net-next.
Otherwise, please let me know if/how you'd like me to reorganise it.
--
David Woodhouse Open Source Technology Centre
david.woodho...@intel.com Intel Corporation
smime.p7s
Description: S/MIME cryptographic signature
