mac80211: delete linux/eeprom_93cx6.h since the module is used from the kernel tree...

[openwrt.git] / tools / firmware-utils / src / mkwrgimg.c

diff --git a/tools/firmware-utils/src/mkwrgimg.c b/tools/firmware-utils/src/mkwrgimg.c
index 052c4f9..3915d14 100644 (file)
--- a/tools/firmware-utils/src/mkwrgimg.c
+++ b/tools/firmware-utils/src/mkwrgimg.c
@@ -49,7 +49,7 @@ static char *progname;
 static char *ifname;
 static char *ofname;
 static char *signature;
 static char *ifname;
 static char *ofname;
 static char *signature;

-static char *devname;
+static char *dev_name;

 static uint32_t offset;
 static int big_endian;
 
 static uint32_t offset;
 static int big_endian;
 


@@ -128,7 +128,7 @@ int main(int argc, char *argv[])
                        big_endian = 1;
                        break;
                case 'd':
                        big_endian = 1;
                        break;
                case 'd':

-                       devname = optarg;
+                       dev_name = optarg;

                        break;
                case 'i':
                        ifname = optarg;
                        break;
                case 'i':
                        ifname = optarg;


@@ -167,7 +167,7 @@ int main(int argc, char *argv[])
                goto err;
        }
 
                goto err;
        }
 

-       if (devname == NULL) {
+       if (dev_name == NULL) {

                ERR("no device name specified");
                goto err;
        }
                ERR("no device name specified");
                goto err;
        }


@@ -202,7 +202,7 @@ int main(int argc, char *argv[])
        memset(header, '\0', sizeof(struct wrg_header));
 
        strncpy(header->signature, signature, sizeof(header->signature));
        memset(header, '\0', sizeof(struct wrg_header));
 
        strncpy(header->signature, signature, sizeof(header->signature));

-       strncpy(header->devname, devname, sizeof(header->signature));
+       strncpy(header->devname, dev_name, sizeof(header->signature));

        put_u32(&header->magic1, WRG_MAGIC);
        put_u32(&header->magic2, WRG_MAGIC);
        put_u32(&header->size, st.st_size);
        put_u32(&header->magic1, WRG_MAGIC);
        put_u32(&header->magic2, WRG_MAGIC);
        put_u32(&header->size, st.st_size);