network_cmds-543.260.3.tar.gz

diff --git a/ifconfig.tproj/ifmedia.c b/ifconfig.tproj/ifmedia.c
index 5c364062e2e7610450b9342a34071418b1be5593..f03e995c8e4f0d9a218a1d4c6de8bc71625180a4 100644 (file)
--- a/ifconfig.tproj/ifmedia.c
+++ b/ifconfig.tproj/ifmedia.c
@@ -113,7 +113,7 @@ media_status(int s)
        (void) memset(&ifmr, 0, sizeof(ifmr));
        (void) strncpy(ifmr.ifm_name, name, sizeof(ifmr.ifm_name));
 
        (void) memset(&ifmr, 0, sizeof(ifmr));
        (void) strncpy(ifmr.ifm_name, name, sizeof(ifmr.ifm_name));
 

-       if (ioctl(s, SIOCGIFMEDIA, (caddr_t)&ifmr) < 0) {
+       if (ioctl(s, SIOCGIFXMEDIA, (caddr_t)&ifmr) < 0) {

                /*
                 * Interface doesn't support SIOC{G,S}IFMEDIA.
                 */
                /*
                 * Interface doesn't support SIOC{G,S}IFMEDIA.
                 */


@@ -130,9 +130,8 @@ media_status(int s)
                err(1, "malloc");
        ifmr.ifm_ulist = media_list;
 
                err(1, "malloc");
        ifmr.ifm_ulist = media_list;
 

-       if (ioctl(s, SIOCGIFMEDIA, (caddr_t)&ifmr) < 0)
-               err(1, "SIOCGIFMEDIA");
-
+       if (ioctl(s, SIOCGIFXMEDIA, (caddr_t)&ifmr) < 0)
+               err(1, "SIOCGIFXMEDIA");

        printf("\tmedia: ");
        print_media_word(ifmr.ifm_current, 1);
        if (ifmr.ifm_active != ifmr.ifm_current) {
        printf("\tmedia: ");
        print_media_word(ifmr.ifm_current, 1);
        if (ifmr.ifm_active != ifmr.ifm_current) {


@@ -217,8 +216,8 @@ ifmedia_getstate(int s)
                 * the current media type and the top-level type.
                 */
 
                 * the current media type and the top-level type.
                 */
 

-               if (ioctl(s, SIOCGIFMEDIA, (caddr_t)ifmr) < 0) {
-                       err(1, "SIOCGIFMEDIA");
+               if (ioctl(s, SIOCGIFXMEDIA, (caddr_t)ifmr) < 0) {
+                       err(1, "SIOCGIFXMEDIA");

                }
 
                if (ifmr->ifm_count == 0)
                }
 
                if (ifmr->ifm_count == 0)


@@ -229,8 +228,8 @@ ifmedia_getstate(int s)
                        err(1, "malloc");
   
                ifmr->ifm_ulist = mwords;
                        err(1, "malloc");
   
                ifmr->ifm_ulist = mwords;

-               if (ioctl(s, SIOCGIFMEDIA, (caddr_t)ifmr) < 0)
-                       err(1, "SIOCGIFMEDIA");
+               if (ioctl(s, SIOCGIFXMEDIA, (caddr_t)ifmr) < 0)
+                       err(1, "SIOCGIFXMEDIA");

        }
 
        return ifmr;
        }
 
        return ifmr;