There are some important fixes to GRO that have not been applied to all
the longterm series.  It should be possible to cherry-pick these without
conflicts.

These 3 have been applied to 2.6.{32,35}.y but are missing from
2.6.33.y:

commit e5093aec2e6b60c3df2420057ffab9ed4a6d2792
Author: Jarek Poplawski <jark...@gmail.com>
Date:   Wed Aug 11 02:02:10 2010 +0000

    net: Fix a memmove bug in dev_gro_receive()

commit 3d3be4333fdf6faa080947b331a6a19bce1a4f57
Author: Eric Dumazet <eric.duma...@gmail.com>
Date:   Wed Sep 1 00:50:51 2010 +0000

    gro: fix different skb headrooms

commit 64289c8e6851bca0e589e064c9a5c9fbd6ae5dd4
Author: Jarek Poplawski <jark...@gmail.com>
Date:   Sat Sep 4 10:34:29 2010 +0000

    gro: Re-fix different skb headrooms

This one is missing from all of 2.6.{32,33,35}.y:

commit d1dc7abf2fafa34b0ffcd070fd59405aa9c0a4d8
Author: Michal Schmidt <mschm...@redhat.com>
Date:   Mon Jan 24 12:08:48 2011 +0000

    GRO: fix merging a paged skb after non-paged skbs

Ben.

-- 
Ben Hutchings, Staff Engineer, Solarflare
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.

_______________________________________________
stable mailing list
stable@linux.kernel.org
http://linux.kernel.org/mailman/listinfo/stable

Reply via email to