ath9k: fix passing MAC time to mac80211

[openwrt.git] / package / mtd / src / mtd.c

diff --git a/package/mtd/src/mtd.c b/package/mtd/src/mtd.c
index 8b87bad..a7d4c1b 100644 (file)
--- a/package/mtd/src/mtd.c
+++ b/package/mtd/src/mtd.c
@@ -41,10 +41,14 @@
 #include <sys/stat.h>
 #include <sys/reboot.h>
 #include <linux/reboot.h>
 #include <sys/stat.h>
 #include <sys/reboot.h>
 #include <linux/reboot.h>

-#include "mtd-api.h"
+#include <mtd/mtd-user.h>

 #include "fis.h"
 #include "mtd.h"
 
 #include "fis.h"
 #include "mtd.h"
 

+#ifndef MTDREFRESH
+#define MTDREFRESH     _IO('M', 50)
+#endif
+

 #define MAX_ARGS 8
 #define JFFS2_DEFAULT_DIR      "" /* directory name without /, empty means root dir */
 
 #define MAX_ARGS 8
 #define JFFS2_DEFAULT_DIR      "" /* directory name without /, empty means root dir */
 


@@ -409,6 +413,9 @@ resume:
                                /* got an EOF marker - this is the place to add some jffs2 data */
                                skip = mtd_replace_jffs2(mtd, fd, e, jffs2file);
 
                                /* got an EOF marker - this is the place to add some jffs2 data */
                                skip = mtd_replace_jffs2(mtd, fd, e, jffs2file);
 

+                               /* don't add it again */
+                               jffs2file = NULL;
+

                                w += skip;
                                e += skip;
                                skip -= buflen;
                                w += skip;
                                e += skip;
                                skip -= buflen;


@@ -597,8 +604,8 @@ int main (int argc, char **argv)
                                jffs2dir = optarg;
                                break;
                        case 'o':
                                jffs2dir = optarg;
                                break;
                        case 'o':

-                           if (!mtd_fixtrx) {
-                                   fprintf(stderr, "-o: Only for brcm47xx/brcm63xx\n");
+                               if (!mtd_fixtrx) {
+                                       fprintf(stderr, "-o: is not available on this platform\n");

                                        usage();
                                }
                                errno = 0;
                                        usage();
                                }
                                errno = 0;