[package] firewall: revert accidential committed changes from r26805

[openwrt.git] / target / linux / generic / patches-2.6.37 / 400-rootfs_split.patch

diff --git a/target/linux/generic/patches-2.6.37/400-rootfs_split.patch b/target/linux/generic/patches-2.6.37/400-rootfs_split.patch
index f5f95cf..1f61bfd 100644 (file)
--- a/target/linux/generic/patches-2.6.37/400-rootfs_split.patch
+++ b/target/linux/generic/patches-2.6.37/400-rootfs_split.patch
@@ -37,7 +37,7 @@
  
  /*
   * MTD methods which simply translate the effective address and pass through
  
  /*
   * MTD methods which simply translate the effective address and pass through

-@@ -618,6 +620,153 @@ int mtd_del_partition(struct mtd_info *m
+@@ -618,6 +620,155 @@ int mtd_del_partition(struct mtd_info *m

  }
  EXPORT_SYMBOL_GPL(mtd_del_partition);
  
  }
  EXPORT_SYMBOL_GPL(mtd_del_partition);
  


@@ -92,9 +92,11 @@
 +{
 +      struct mtd_partition *dpart;
 +      struct mtd_part *slave = NULL;
 +{
 +      struct mtd_partition *dpart;
 +      struct mtd_part *slave = NULL;

++      struct mtd_part *spart;

 +      int ret, split_offset = 0;
 +
 +      int ret, split_offset = 0;
 +

-+      ret = split_squashfs(master, part->offset, &split_offset);
++      spart = PART(rpart);
++      ret = split_squashfs(master, spart->offset, &split_offset);

 +      if (ret)
 +              return ret;
 +
 +      if (ret)
 +              return ret;
 +


@@ -112,7 +114,7 @@
 +      dpart->name = (unsigned char *)&dpart[1];
 +      strcpy(dpart->name, ROOTFS_SPLIT_NAME);
 +
 +      dpart->name = (unsigned char *)&dpart[1];
 +      strcpy(dpart->name, ROOTFS_SPLIT_NAME);
 +

-+      dpart->size -= split_offset - dpart->offset;
++      dpart->size = rpart->size - (split_offset - spart->offset);

 +      dpart->offset = split_offset;
 +
 +      if (dpart == NULL)
 +      dpart->offset = split_offset;
 +
 +      if (dpart == NULL)