hak5
/
wifipineapple-openwrt
mirror of https://github.com/hak5/wifipineapple-openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[generic]: fixup mtd refresh and co. 

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27491 3c298f89-4303-0410-b956-a3cf2f4a3e73
master
Imre Kaloz 2011-07-06 12:55:21 +00:00
parent ef94469a6f
commit ce9bbbd6ec
5 changed files with 32 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target/linux/generic/patches-2.6.36/065-rootfs_split.patch
View File

@ -621,7 +621,7 @@
#define MEMWRITEOOB64 _IOWR('M', 21, struct mtd_oob_buf64)
#define MEMREADOOB64 _IOWR('M', 22, struct mtd_oob_buf64)
#define MEMISLOCKED _IOR('M', 23, struct erase_info_user)
+#define MTDREFRESH _IO('M', 23)
+#define MTDREFRESH _IO('M', 24)
/*
* Obsolete legacy interface. Keep it in order not to break userspace

10
target/linux/generic/patches-2.6.37/400-rootfs_split.patch
View File

@ -259,10 +259,10 @@
--- a/drivers/mtd/mtdchar.c
+++ b/drivers/mtd/mtdchar.c
@@ -841,6 +841,13 @@ static int mtd_ioctl(struct file *file,
file->f_pos = 0;
@@ -956,6 +956,13 @@ static int mtd_ioctl(struct file *file,
break;
}
#endif
+#ifdef CONFIG_MTD_PARTITIONS
+ case MTDREFRESH:
+ {
@ -271,8 +271,8 @@
+ }
+#endif
case OTPGETREGIONCOUNT:
case OTPGETREGIONINFO:
default:
ret = -ENOTTY;
--- a/include/linux/mtd/mtd.h
+++ b/include/linux/mtd/mtd.h
@@ -125,6 +125,7 @@ struct nand_ecclayout {
@ -325,7 +325,7 @@
#define MEMWRITEOOB64 _IOWR('M', 21, struct mtd_oob_buf64)
#define MEMREADOOB64 _IOWR('M', 22, struct mtd_oob_buf64)
#define MEMISLOCKED _IOR('M', 23, struct erase_info_user)
+#define MTDREFRESH _IO('M', 23)
+#define MTDREFRESH _IO('M', 24)
/*
* Obsolete legacy interface. Keep it in order not to break userspace

10
target/linux/generic/patches-2.6.38/400-rootfs_split.patch
View File

@ -260,10 +260,10 @@
--- a/drivers/mtd/mtdchar.c
+++ b/drivers/mtd/mtdchar.c
@@ -841,6 +841,13 @@ static int mtd_ioctl(struct file *file,
file->f_pos = 0;
@@ -956,6 +956,13 @@ static int mtd_ioctl(struct file *file,
break;
}
#endif
+#ifdef CONFIG_MTD_PARTITIONS
+ case MTDREFRESH:
+ {
@ -272,8 +272,8 @@
+ }
+#endif
case OTPGETREGIONCOUNT:
case OTPGETREGIONINFO:
default:
ret = -ENOTTY;
--- a/include/linux/mtd/mtd.h
+++ b/include/linux/mtd/mtd.h
@@ -125,6 +125,7 @@ struct nand_ecclayout {
@ -326,7 +326,7 @@
#define MEMWRITEOOB64 _IOWR('M', 21, struct mtd_oob_buf64)
#define MEMREADOOB64 _IOWR('M', 22, struct mtd_oob_buf64)
#define MEMISLOCKED _IOR('M', 23, struct erase_info_user)
+#define MTDREFRESH _IO('M', 23)
+#define MTDREFRESH _IO('M', 24)
/*
* Obsolete legacy interface. Keep it in order not to break userspace

10
target/linux/generic/patches-2.6.39/400-rootfs_split.patch
View File

@ -260,10 +260,10 @@
--- a/drivers/mtd/mtdchar.c
+++ b/drivers/mtd/mtdchar.c
@@ -841,6 +841,13 @@ static int mtd_ioctl(struct file *file,
file->f_pos = 0;
@@ -956,6 +956,13 @@ static int mtd_ioctl(struct file *file,
break;
}
#endif
+#ifdef CONFIG_MTD_PARTITIONS
+ case MTDREFRESH:
+ {
@ -272,8 +272,8 @@
+ }
+#endif
case OTPGETREGIONCOUNT:
case OTPGETREGIONINFO:
default:
ret = -ENOTTY;
--- a/include/linux/mtd/mtd.h
+++ b/include/linux/mtd/mtd.h
@@ -125,6 +125,7 @@ struct nand_ecclayout {
@ -325,7 +325,7 @@
#define MEMWRITEOOB64 _IOWR('M', 21, struct mtd_oob_buf64)
#define MEMREADOOB64 _IOWR('M', 22, struct mtd_oob_buf64)
#define MEMISLOCKED _IOR('M', 23, struct erase_info_user)
+#define MTDREFRESH _IO('M', 23)
+#define MTDREFRESH _IO('M', 24)
/*
* Obsolete legacy interface. Keep it in order not to break userspace

21
target/linux/generic/patches-3.0/400-rootfs_split.patch
View File

@ -257,18 +257,19 @@
--- a/drivers/mtd/mtdchar.c
+++ b/drivers/mtd/mtdchar.c
@@ -834,6 +834,11 @@ static int mtd_ioctl(struct file *file,
file->f_pos = 0;
@@ -948,6 +948,12 @@ static int mtd_ioctl(struct file *file,
break;
}
+ case MTDREFRESH:
+ {
+ ret = mtd_device_refresh(mtd);
+ break;
+ }
case OTPGETREGIONCOUNT:
case OTPGETREGIONINFO:
+
default:
ret = -ENOTTY;
}
--- a/include/linux/mtd/mtd.h
+++ b/include/linux/mtd/mtd.h
@@ -125,6 +125,7 @@ struct nand_ecclayout {
@ -314,3 +315,13 @@
};
#define MTDPART_OFS_NXTBLK (-2)
--- a/include/mtd/mtd-abi.h
+++ b/include/mtd/mtd-abi.h
@@ -127,6 +127,7 @@ struct otp_info {
#define MEMWRITEOOB64 _IOWR('M', 21, struct mtd_oob_buf64)
#define MEMREADOOB64 _IOWR('M', 22, struct mtd_oob_buf64)
#define MEMISLOCKED _IOR('M', 23, struct erase_info_user)
+#define MTDREFRESH _IO('M', 24)
/*
* Obsolete legacy interface. Keep it in order not to break userspace