diff options
author | Felix Fietkau <nbd@openwrt.org> | 2005-04-03 21:54:50 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2005-04-03 21:54:50 +0000 |
commit | 3944a0647dd2b52184dde15d034be80abf9c5f41 (patch) | |
tree | 468453aa18b27dcf7cb2fe093c35c3b453584320 /package/wireless-tools/patches | |
parent | 5d45603b1f279df9f784ee10b4bbc43c2f139a0c (diff) | |
download | upstream-3944a0647dd2b52184dde15d034be80abf9c5f41.tar.gz upstream-3944a0647dd2b52184dde15d034be80abf9c5f41.tar.bz2 upstream-3944a0647dd2b52184dde15d034be80abf9c5f41.zip |
update wireless tools to 28.pre6 (switch to multicall-binary)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@552 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/wireless-tools/patches')
-rw-r--r-- | package/wireless-tools/patches/debian-2.patch | 54 |
1 files changed, 0 insertions, 54 deletions
diff --git a/package/wireless-tools/patches/debian-2.patch b/package/wireless-tools/patches/debian-2.patch index 158e634390..ba8755b705 100644 --- a/package/wireless-tools/patches/debian-2.patch +++ b/package/wireless-tools/patches/debian-2.patch @@ -33,57 +33,3 @@ DEPFLAGS=-MMD XCFLAGS=$(CFLAGS) $(DEPFLAGS) $(WARN) $(HEADERS) $(WELIB_FLAG) PICFLAG=-fPIC ---- wireless-tools-27.orig/iwlist.c -+++ wireless-tools-27/iwlist.c -@@ -870,7 +870,7 @@ - struct iw_range range; - int has_range; - struct timeval tv; /* Select timeout */ -- int timeout = 5000000; /* 5s */ -+ int timeout = 15000000; /* 15s */ - - /* Avoid "Unused parameter" warning */ - args = args; count = count; ---- wireless-tools-27.orig/iwconfig.c -+++ wireless-tools-27/iwconfig.c -@@ -835,10 +835,10 @@ - } - else - { -- /* '-' allow to escape the ESSID string, allowing -+ /* '-' or '--' allow to escape the ESSID string, allowing - * to set it to the string "any" or "off". - * This is a big ugly, but it will do for now */ -- if(!strcmp(args[i], "-")) -+ if(!strcmp(args[i], "-") || !strcmp(args[i], "--")) - { - i++; - if(i >= count) -@@ -1377,12 +1377,21 @@ - if (!strcmp(argv[1], "-v") || !strcmp(argv[1], "--version")) - goterr = iw_print_version_info("iwconfig"); - else -- /* The device name must be the first argument */ -- if(argc == 2) -- print_info(skfd, argv[1], NULL, 0); -- else -- /* The other args on the line specify options to be set... */ -- goterr = set_info(skfd, argv + 2, argc - 2, argv[1]); -+ { -+ /* '--' escape device name */ -+ if((argc > 2) && !strcmp(argv[1], "--")) -+ { -+ argv++; -+ argc--; -+ } -+ -+ /* The device name must be the first argument */ -+ if(argc == 2) -+ print_info(skfd, argv[1], NULL, 0); -+ else -+ /* The other args on the line specify options to be set... */ -+ goterr = set_info(skfd, argv + 2, argc - 2, argv[1]); -+ } - - /* Close the socket. */ - iw_sockets_close(skfd); |