Merge trunk into realtek-unstable

Conflicts:
	Config.in
	feeds.conf.default
	package/base-files/files/etc/hotplug2-common.rules
	package/network/config/netifd/files/etc/init.d/network

1 files changed, 28 insertions, 1 deletions

diff --git a/package/network/utils/iwinfo/src/iwinfo_cli.c b/package/network/utils/iwinfo/src/iwinfo_cli.c
index 7ec5aef95..8da216a6e 100644
--- a/package/network/utils/iwinfo/src/iwinfo_cli.c
+++ b/package/network/utils/iwinfo/src/iwinfo_cli.c
@@ -17,6 +17,7 @@
  */
 
 #include <stdio.h>
+#include <glob.h>
 
 #include "iwinfo.h"
 
@@ -735,9 +736,11 @@ static void print_countrylist(const struct iwinfo_ops *iw, const char *ifname)
 int main(int argc, char **argv)
 {
 	int i;
+	char *p;
 	const struct iwinfo_ops *iw;
+	glob_t globbuf;
 
-	if (argc < 3)
+	if (argc > 1 && argc < 3)
 	{
 		fprintf(stderr,
 			"Usage:\n"
@@ -752,6 +755,30 @@ int main(int argc, char **argv)
 		return 1;
 	}
 
+	if (argc == 1)
+	{
+		glob("/sys/class/net/*", 0, NULL, &globbuf);
+
+		for (i = 0; i < globbuf.gl_pathc; i++)
+		{
+			p = strrchr(globbuf.gl_pathv[i], '/');
+
+			if (!p)
+				continue;
+
+			iw = iwinfo_backend(++p);
+
+			if (!iw)
+				continue;
+
+			print_info(iw, p);
+			printf("\n");
+		}
+
+		globfree(&globbuf);
+		return 0;
+	}
+
 	iw = iwinfo_backend(argv[1]);
 
 	if (!iw)