network_cmds-356.8.tar.gz

[apple/network_cmds.git] / ifconfig.tproj / ifmedia.c

diff --git a/ifconfig.tproj/ifmedia.c b/ifconfig.tproj/ifmedia.c
index cefaacf0dd694342c743e5d1ab00071b63e1d91e..5c364062e2e7610450b9342a34071418b1be5593 100644 (file)
--- a/ifconfig.tproj/ifmedia.c
+++ b/ifconfig.tproj/ifmedia.c
@@ -394,16 +394,16 @@ static struct ifmedia_description ifm_subtype_fddi_aliases[] =
 static struct ifmedia_description ifm_subtype_fddi_option_descriptions[] =
     IFM_SUBTYPE_FDDI_OPTION_DESCRIPTIONS;
 
 static struct ifmedia_description ifm_subtype_fddi_option_descriptions[] =
     IFM_SUBTYPE_FDDI_OPTION_DESCRIPTIONS;
 

-#ifdef notdef

 static struct ifmedia_description ifm_subtype_ieee80211_descriptions[] =
     IFM_SUBTYPE_IEEE80211_DESCRIPTIONS;
 
 static struct ifmedia_description ifm_subtype_ieee80211_descriptions[] =
     IFM_SUBTYPE_IEEE80211_DESCRIPTIONS;
 

-static struct ifmedia_description ifm_subtype_ieee80211_aliases[] =
-    IFM_SUBTYPE_IEEE80211_ALIASES;
-

 static struct ifmedia_description ifm_subtype_ieee80211_option_descriptions[] =
     IFM_SUBTYPE_IEEE80211_OPTION_DESCRIPTIONS;
 
 static struct ifmedia_description ifm_subtype_ieee80211_option_descriptions[] =
     IFM_SUBTYPE_IEEE80211_OPTION_DESCRIPTIONS;
 

+#ifdef notdef
+static struct ifmedia_description ifm_subtype_ieee80211_aliases[] =
+IFM_SUBTYPE_IEEE80211_ALIASES;
+

 struct ifmedia_description ifm_subtype_ieee80211_mode_descriptions[] =
     IFM_SUBTYPE_IEEE80211_MODE_DESCRIPTIONS;
 
 struct ifmedia_description ifm_subtype_ieee80211_mode_descriptions[] =
     IFM_SUBTYPE_IEEE80211_MODE_DESCRIPTIONS;
 


@@ -497,6 +497,24 @@ static struct ifmedia_type_to_subtype ifmedia_types_to_subtypes[] = {
                        { NULL, 0 },
                },
        },
                        { NULL, 0 },
                },
        },

+#ifdef __APPLE__
+       {
+               {
+                       { &ifm_subtype_shared_descriptions[0], 0 },
+                       { &ifm_subtype_shared_aliases[0], 1 },
+                       { &ifm_subtype_ieee80211_descriptions[0], 0 },
+                       { NULL, 0 },
+               },
+               {
+                       { &ifm_shared_option_descriptions[0], 0 },
+                       { &ifm_subtype_ieee80211_option_descriptions[0], 1 },
+                       { NULL, 0 },
+               },
+               {
+                       { NULL, 0 },
+               },
+       },
+#else /* __APPLE__ */

 #ifdef notdef
        {
                {
 #ifdef notdef
        {
                {


@@ -535,6 +553,7 @@ static struct ifmedia_type_to_subtype ifmedia_types_to_subtypes[] = {
                },
        },
 #endif
                },
        },
 #endif

+#endif /* __APPLE__ */

 };
 
 static int
 };
 
 static int