[Xen-devel] [GIT 0/4] netback patches from XCP patch queue

[Ian Campbell <Ian.Campbell@xxxxxxxxxx>]

The following pull includes a patch from XCP to linearise fragmented
packets into the receiver's buffer as well as a couple of fixes picked
up from linux-2.6.18-xen.hg and the SLES11 kernel plus a small cleanup.

There were lots of merge conflicts with
xen/dom0/backends/netback-tasklet so I didn't want to base on plain
xen/dom0/backends/netback. Therefore I merged netback-tasklet into the
netback and based my patches on that, so this pull appears to include
those changes as well. 

The result merges cleanly onto c2cb3df04eb3ff68d0de102b2acacc9b8616e659
which is the commit just before netback-tasklet was reverted out of
xen/stable-2.6.32.x. It looks like a fix is available and I think this
branch can be merged following the reintroduction of the netback-tasklet
branch into the stable branch.

I will follow up with the 4 new patches, omitting the ones from the
netback-tasklet branch and the merge itself.

The following changes since commit
224c3a282f9b0916eb2fc1f0278e6638cffada2c:
  James Harper (1):
        xen/netback: avoid null-pointer access in netback_uevent

are available in the git repository at:

  git://xenbits.xensource.com/people/ianc/linux-2.6.git for-jeremy/netback

Dongxiao Xu (4):
      xen/netback: Move global/static variables into struct xen_netbk.
      xen/netback: Introduce a new struct type page_ext.
      xen/netback: Multiple tasklets support.
      xen/netback: Use Kernel thread to replace the tasklet.

Ian Campbell (4):
      Merge branch 'xen/dom0/backend/netback-tasklet' of 
git://git.kernel.org/.../jeremy/xen into netback
      xen: netback: handle NET_SKBUFF_DATA_USES_OFFSET correctly
      xen: netback: drop frag member from struct netbk_rx_meta
      xen/netback: linearise SKBs as we copy them into guest memory on guest-RX.

Keir Fraser (1):
      xen: netback: Fixes for delayed copy of tx network packets.

 drivers/xen/netback/common.h    |  101 ++++-
 drivers/xen/netback/interface.c |   27 ++
 drivers/xen/netback/netback.c   |  942 +++++++++++++++++++++++++--------------
 3 files changed, 728 insertions(+), 342 deletions(-)


Ian.


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel