summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-12-04 18:11:57 +0000
committerjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-12-04 18:11:57 +0000
commit9b5e9a5afbb63f073ed6b45b40c2b8258d41910d (patch)
tree1ed9d91c21c13a129ab61224dc4c9520bb89f436
parent974654e8c568bdb86192a1997702d1204cd9bcdf (diff)
[package] iwinfo: fix model detection on legacy atheros
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29423 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/iwinfo/src/iwinfo_madwifi.c69
1 files changed, 68 insertions, 1 deletions
diff --git a/package/iwinfo/src/iwinfo_madwifi.c b/package/iwinfo/src/iwinfo_madwifi.c
index feb98e25a2..50793c4937 100644
--- a/package/iwinfo/src/iwinfo_madwifi.c
+++ b/package/iwinfo/src/iwinfo_madwifi.c
@@ -988,9 +988,76 @@ int madwifi_get_mbssid_support(const char *ifname, int *buf)
return -1;
}
+static void madwifi_proc_file(const char *ifname, const char *file,
+ char *buf, int blen)
+{
+ int fd;
+ const char *wifi = madwifi_isvap(ifname, NULL);
+
+ if (!wifi && madwifi_iswifi(ifname))
+ wifi = ifname;
+
+ snprintf(buf, blen, "/proc/sys/dev/%s/%s", wifi, file);
+
+ if ((fd = open(buf, O_RDONLY)) > 0)
+ {
+ if (read(fd, buf, blen) > 1)
+ buf[strlen(buf)-1] = 0;
+ else
+ buf[0] = 0;
+
+ close(fd);
+ }
+ else
+ {
+ buf[0] = 0;
+ }
+}
+
+static int madwifi_startswith(const char *a, const char *b)
+{
+ int l1 = strlen(a);
+ int l2 = strlen(b);
+ int ln = (l1 < l2) ? l1 : l2;
+ return !strncmp(a, b, ln);
+}
+
int madwifi_get_hardware_id(const char *ifname, char *buf)
{
- return wext_get_hardware_id(ifname, buf);
+ char vendor[64];
+ char device[64];
+ struct iwinfo_hardware_id *ids;
+ struct iwinfo_hardware_entry *e;
+
+ if (wext_get_hardware_id(ifname, buf))
+ {
+ ids = (struct iwinfo_hardware_id *)buf;
+ madwifi_proc_file(ifname, "dev_vendor", vendor, sizeof(vendor));
+ madwifi_proc_file(ifname, "dev_name", device, sizeof(device));
+
+ if (vendor[0] && device[0])
+ {
+ for (e = IWINFO_HARDWARE_ENTRIES; e->vendor_name; e++)
+ {
+ if (!madwifi_startswith(vendor, e->vendor_name))
+ continue;
+
+ if (!madwifi_startswith(device, e->device_name))
+ continue;
+
+ ids->vendor_id = e->vendor_id;
+ ids->device_id = e->device_id;
+ ids->subsystem_vendor_id = e->subsystem_vendor_id;
+ ids->subsystem_device_id = e->subsystem_device_id;
+
+ return 0;
+ }
+ }
+
+ return -1;
+ }
+
+ return 0;
}
int madwifi_get_hardware_name(const char *ifname, char *buf)