firmware-utils/mktplinkfw: add support for the TL-WR841N v7

[openwrt.git] / tools / mtd-utils / patches / 101-ubifs-optional_lzo.patch

diff --git a/tools/mtd-utils/patches/101-ubifs-optional_lzo.patch b/tools/mtd-utils/patches/101-ubifs-optional_lzo.patch
index 35a7cd8..d49c94b 100644 (file)
--- a/tools/mtd-utils/patches/101-ubifs-optional_lzo.patch
+++ b/tools/mtd-utils/patches/101-ubifs-optional_lzo.patch
@@ -15,7 +15,17 @@ diff --git a/mkfs.ubifs/compr.c b/mkfs.ubifs/compr.c
 index e378c5d..0208f80 100644
 --- a/mkfs.ubifs/compr.c
 +++ b/mkfs.ubifs/compr.c
 index e378c5d..0208f80 100644
 --- a/mkfs.ubifs/compr.c
 +++ b/mkfs.ubifs/compr.c

-@@ -83,6 +83,17 @@ static int zlib_deflate(void *in_buf, size_t in_len, void *out_buf,
+@@ -25,7 +25,9 @@
+ #include <stdint.h>
+ #include <string.h>
+ #include <zlib.h>
++#if CONFIG_UBIFS_LZO
+ #include <lzo/lzo1x.h>
++#endif
+ #include <linux/types.h>
+ 
+ #include "compr.h"
+@@ -83,6 +85,17 @@ static int zlib_deflate(void *in_buf, size_t in_len, void *out_buf,

        return 0;
  }
  
        return 0;
  }
  


@@ -33,7 +43,7 @@ index e378c5d..0208f80 100644
  static int lzo_compress(void *in_buf, size_t in_len, void *out_buf,
                        size_t *out_len)
  {
  static int lzo_compress(void *in_buf, size_t in_len, void *out_buf,
                        size_t *out_len)
  {

-@@ -101,14 +112,16 @@ static int lzo_compress(void *in_buf, size_t in_len, void *out_buf,
+@@ -101,14 +114,16 @@ static int lzo_compress(void *in_buf, size_t in_len, void *out_buf,

        return 0;
  }
  
        return 0;
  }
  


@@ -55,7 +65,7 @@ index e378c5d..0208f80 100644
  static char *zlib_buf;
  
  static int favor_lzo_compress(void *in_buf, size_t in_len, void *out_buf,
  static char *zlib_buf;
  
  static int favor_lzo_compress(void *in_buf, size_t in_len, void *out_buf,

-@@ -195,9 +208,11 @@ int compress_data(void *in_buf, size_t in_len, void *out_buf, size_t *out_len,
+@@ -195,9 +210,11 @@ int compress_data(void *in_buf, size_t in_len, void *out_buf, size_t *out_len,

  
  int init_compression(void)
  {
  
  int init_compression(void)
  {


@@ -67,7 +77,7 @@ index e378c5d..0208f80 100644
  
        zlib_buf = malloc(UBIFS_BLOCK_SIZE * WORST_COMPR_FACTOR);
        if (!zlib_buf) {
  
        zlib_buf = malloc(UBIFS_BLOCK_SIZE * WORST_COMPR_FACTOR);
        if (!zlib_buf) {

-@@ -211,7 +226,9 @@ int init_compression(void)
+@@ -211,7 +228,9 @@ int init_compression(void)

  void destroy_compression(void)
  {
        free(zlib_buf);
  void destroy_compression(void)
  {
        free(zlib_buf);