colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nm-tool: add carrier property to wired devices; remove "supported"

Browse Source 
"supported" was always yes anyway.
This commit is contained in:
Dan Williams
2009-02-04 09:07:58 -05:00
parent 196c2055c7
commit c2f228e7b7
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
test/nm-tool.c
View File

@@ -266,10 +266,6 @@ detail_device (gpointer data, gpointer user_data)
/* Capabilities */ /* Capabilities */
caps = nm_device_get_capabilities (device); caps = nm_device_get_capabilities (device);
printf ("\n Capabilities:\n"); printf ("\n Capabilities:\n");
if (caps & NM_DEVICE_CAP_NM_SUPPORTED)
print_string (" Supported", "yes");
else
print_string (" Supported", "no");
if (caps & NM_DEVICE_CAP_CARRIER_DETECT) if (caps & NM_DEVICE_CAP_CARRIER_DETECT)
print_string (" Carrier Detect", "yes"); print_string (" Carrier Detect", "yes");
@@ -298,7 +294,7 @@ detail_device (gpointer data, gpointer user_data)
const char *active_bssid = NULL; const char *active_bssid = NULL;
const GPtrArray *aps; const GPtrArray *aps;
printf ("\n Wireless Settings\n"); printf ("\n Wireless Properties\n");
wcaps = nm_device_wifi_get_capabilities (NM_DEVICE_WIFI (device)); wcaps = nm_device_wifi_get_capabilities (NM_DEVICE_WIFI (device));
@@ -320,14 +316,12 @@ detail_device (gpointer data, gpointer user_data)
if (aps && aps->len) if (aps && aps->len)
g_ptr_array_foreach ((GPtrArray *) aps, detail_access_point, (gpointer) active_bssid); g_ptr_array_foreach ((GPtrArray *) aps, detail_access_point, (gpointer) active_bssid);
} else if (NM_IS_DEVICE_ETHERNET (device)) { } else if (NM_IS_DEVICE_ETHERNET (device)) {
printf ("\n Wired Settings\n"); printf ("\n Wired Properties\n");
/* FIXME */
#if 0 if (nm_device_ethernet_get_carrier (NM_DEVICE_ETHERNET (device)))
if (link_active) print_string (" Carrier", "on");
print_string (" Hardware Link", "yes");
else else
print_string (" Hardware Link", "no"); print_string (" Carrier", "off");
#endif
} }
/* IP Setup info */ /* IP Setup info */