Imported linux-2.6.27.39 suse/xen patches.

[ipfire-2.x.git] / src / patches / suse-2.6.27.39 / patches.drivers / cxgb3i_ddp.patch

diff --git a/src/patches/suse-2.6.27.31/patches.drivers/cxgb3i_ddp.patch b/src/patches/suse-2.6.27.39/patches.drivers/cxgb3i_ddp.patch
similarity index 97%
rename from src/patches/suse-2.6.27.31/patches.drivers/cxgb3i_ddp.patch
rename to src/patches/suse-2.6.27.39/patches.drivers/cxgb3i_ddp.patch
index 46a30835efa7af678b71b7cc46119435ad0fba56..08139b5f459cc2c8b24e809667b79256fd7208c4 100644 (file)
--- a/src/patches/suse-2.6.27.31/patches.drivers/cxgb3i_ddp.patch
+++ b/src/patches/suse-2.6.27.39/patches.drivers/cxgb3i_ddp.patch
@@ -45,8 +45,8 @@ diff -uNr linux-2.6.27.7-4.orig/Documentation/scsi/cxgb3i.txt linux-2.6.27.7-4.n
 +      iface.ipaddress = <iscsi ip address>
 +
 +   * iface.ipaddress is optional, <iscsi ip address> can be either the same as
-+      the ethX's ip address or an address on the same subnet. Make sure the
-+      address is unique in the network.
++      the ethX's ip address or an address on the same subnet. Make sure the
++      address is unique in the network.
 +
 +2. edit /etc/iscsi/iscsid.conf
 +   The default setting for MaxRecvDataSegmentLength (131072) is too big, search
@@ -57,7 +57,7 @@ diff -uNr linux-2.6.27.7-4.orig/Documentation/scsi/cxgb3i.txt linux-2.6.27.7-4.n
 +      node.conn[0].iscsi.MaxRecvDataSegmentLength = 8192
 +
 +3. Load the cxgb3i driver: "modprobe cxgb3i"
-+   
++
 +   * in the case of recompiling the kernel, the cxgb3i selection is located at
 +      Device Drivers
 +              SCSI device support --->
@@ -260,15 +260,6 @@ diff -uNr linux-2.6.27.7-4.orig/drivers/scsi/cxgb3i/cxgb3i_ulp2.c linux-2.6.27.7
        }
  
        if (ddp_alloc_gl_skb(ddp, idx, npods, gfp) < 0)
-@@ -341,7 +344,7 @@
- 
-       if (ddp_gl_map(snic->pdev, gl) < 0)
-               goto unmap_sgl;
--
-+      
-       tag = sw_tag | (idx << snic->tag_format.rsvd_shift);
- 
-       hdr.rsvd = 0;
 @@ -363,6 +366,8 @@
        ddp_free_gl_skb(ddp, idx, npods);
  unmark_entries: