1 files changed, 17 insertions, 2 deletions
diff --git a/src/w32.c b/src/w32.c
index a6ebe55ee4d..9f3c1b5d6ed 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -9540,8 +9540,23 @@ network_interface_list (bool full, unsigned short match)
      switch (adapter->IfType)
        {
        case IF_TYPE_ETHERNET_CSMACD:
-          ifmt_idx = ETHERNET;
+          /* Windows before Vista reports wireless adapters as
-          if_num = eth_count++;
+             Ethernet.  Work around by looking at the Description
+             string.  */
+          {
+          char description[MAX_UTF8_PATH];
+          if (filename_from_utf16 (adapter->Description, description) == 0
+              && strstr (description, "Wireless "))
+            {
+              ifmt_idx = WLAN;
+              if_num = wlan_count++;
+            }
+          else
+            {
+              ifmt_idx = ETHERNET;
+              if_num = eth_count++;
+            }
+          }
          break;
        case IF_TYPE_ISO88025_TOKENRING:
          ifmt_idx = TOKENRING;

diff --git a/src/w32.c b/src/w32.c index a6ebe55ee4d..9f3c1b5d6ed 100644 --- a/src/w32.c +++ b/src/w32.c
@@ -9540,8 +9540,23 @@ network_interface_list (bool full, unsigned short match)
9540	switch (adapter->IfType)	9540	switch (adapter->IfType)
9541	{	9541	{
9542	case IF_TYPE_ETHERNET_CSMACD:	9542	case IF_TYPE_ETHERNET_CSMACD:
9543	ifmt_idx = ETHERNET;	9543	/* Windows before Vista reports wireless adapters as
9544	if_num = eth_count++;	9544	Ethernet. Work around by looking at the Description
		9545	string. */
		9546	{
		9547	char description[MAX_UTF8_PATH];
		9548	if (filename_from_utf16 (adapter->Description, description) == 0
		9549	&& strstr (description, "Wireless "))
		9550	{
		9551	ifmt_idx = WLAN;
		9552	if_num = wlan_count++;
		9553	}
		9554	else
		9555	{
		9556	ifmt_idx = ETHERNET;
		9557	if_num = eth_count++;
		9558	}
		9559	}
9545	break;	9560	break;
9546	case IF_TYPE_ISO88025_TOKENRING:	9561	case IF_TYPE_ISO88025_TOKENRING:
9547	ifmt_idx = TOKENRING;	9562	ifmt_idx = TOKENRING;