diff options
| -rw-r--r-- | sbin/ifconfig/ifconfig.c | 540 | ||||
| -rw-r--r-- | sys/conf/files | 3 | ||||
| -rw-r--r-- | sys/dev/pci/if_xl.c | 240 | ||||
| -rw-r--r-- | sys/dev/pci/if_xlreg.h | 4 | ||||
| -rw-r--r-- | sys/net/if.h | 14 | ||||
| -rw-r--r-- | sys/net/if_media.c | 456 | ||||
| -rw-r--r-- | sys/net/if_media.h | 356 |
7 files changed, 1517 insertions, 96 deletions
diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c index 52122d3baad..b40c780a50a 100644 --- a/sbin/ifconfig/ifconfig.c +++ b/sbin/ifconfig/ifconfig.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ifconfig.c,v 1.18 1998/07/09 06:12:09 deraadt Exp $ */ +/* $OpenBSD: ifconfig.c,v 1.19 1998/09/03 06:24:18 jason Exp $ */ /* $NetBSD: ifconfig.c,v 1.40 1997/10/01 02:19:43 enami Exp $ */ /* @@ -34,6 +34,43 @@ * SUCH DAMAGE. */ +/*- + * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility, + * NASA Ames Research Center. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the NetBSD + * Foundation, Inc. and its contributors. + * 4. Neither the name of The NetBSD Foundation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + #ifndef lint static char copyright[] = "@(#) Copyright (c) 1983, 1993\n\ @@ -44,7 +81,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)ifconfig.c 8.2 (Berkeley) 2/16/94"; #else -static char rcsid[] = "$OpenBSD: ifconfig.c,v 1.18 1998/07/09 06:12:09 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: ifconfig.c,v 1.19 1998/09/03 06:24:18 jason Exp $"; #endif #endif /* not lint */ @@ -53,6 +90,8 @@ static char rcsid[] = "$OpenBSD: ifconfig.c,v 1.18 1998/07/09 06:12:09 deraadt E #include <sys/ioctl.h> #include <net/if.h> +#include <net/if_dl.h> +#include <net/if_media.h> #include <netinet/in.h> #include <arpa/inet.h> @@ -113,53 +152,84 @@ void setipxframetype __P((char *, int)); void setatrange __P((char *, int)); void setatphase __P((char *, int)); void checkatrange __P ((struct sockaddr_at *)); +void setmedia __P((char *, int)); +void setmediaopt __P((char *, int)); +void unsetmediaopt __P((char *, int)); +void setmediainst __P((char *, int)); +void fixnsel __P((struct sockaddr_iso *)); +int main __P((int, char *[])); + +/* + * Media stuff. Whenever a media command is first performed, the + * currently select media is grabbed for this interface. If `media' + * is given, the current media word is modifed. `mediaopt' commands + * only modify the set and clear words. They then operate on the + * current media word later. + */ +int media_current; +int mediaopt_set; +int mediaopt_clear; + +int actions; /* Actions performed */ + +#define A_MEDIA 0x0001 /* media command */ +#define A_MEDIAOPTSET 0x0002 /* mediaopt command */ +#define A_MEDIAOPTCLR 0x0004 /* -mediaopt command */ +#define A_MEDIAOPT (A_MEDIAOPTSET|A_MEDIAOPTCLR) +#define A_MEDIAINST 0x0008 /* instance or inst command */ #define NEXTARG 0xffffff struct cmd { char *c_name; int c_parameter; /* NEXTARG means next argv */ + int c_action; /* defered action */ void (*c_func)(); } cmds[] = { - { "up", IFF_UP, setifflags } , - { "down", -IFF_UP, setifflags }, - { "trailers", -1, notrailers }, - { "-trailers", 1, notrailers }, - { "arp", -IFF_NOARP, setifflags }, - { "-arp", IFF_NOARP, setifflags }, - { "debug", IFF_DEBUG, setifflags }, - { "-debug", -IFF_DEBUG, setifflags }, - { "alias", IFF_UP, notealias }, - { "-alias", -IFF_UP, notealias }, - { "delete", -IFF_UP, notealias }, + { "up", IFF_UP, 0, setifflags } , + { "down", -IFF_UP, 0, setifflags }, + { "trailers", -1, 0, notrailers }, + { "-trailers", 1, 0, notrailers }, + { "arp", -IFF_NOARP, 0, setifflags }, + { "-arp", IFF_NOARP, 0, setifflags }, + { "debug", IFF_DEBUG, 0, setifflags }, + { "-debug", -IFF_DEBUG, 0, setifflags }, + { "alias", IFF_UP, 0, notealias }, + { "-alias", -IFF_UP, 0, notealias }, + { "delete", -IFF_UP, 0, notealias }, #ifdef notdef #define EN_SWABIPS 0x1000 - { "swabips", EN_SWABIPS, setifflags }, - { "-swabips", -EN_SWABIPS, setifflags }, + { "swabips", EN_SWABIPS, 0, setifflags }, + { "-swabips", -EN_SWABIPS, 0, setifflags }, #endif - { "netmask", NEXTARG, setifnetmask }, - { "metric", NEXTARG, setifmetric }, - { "broadcast", NEXTARG, setifbroadaddr }, - { "ipdst", NEXTARG, setifipdst }, + { "netmask", NEXTARG, 0, setifnetmask }, + { "metric", NEXTARG, 0, setifmetric }, + { "broadcast", NEXTARG, 0, setifbroadaddr }, + { "ipdst", NEXTARG, 0, setifipdst }, #ifndef INET_ONLY - { "range", NEXTARG, setatrange }, - { "phase", NEXTARG, setatphase }, - { "snpaoffset", NEXTARG, setsnpaoffset }, - { "nsellength", NEXTARG, setnsellength }, - { "802.2", ETHERTYPE_8022, setipxframetype }, - { "802.2tr", ETHERTYPE_8022TR, setipxframetype }, - { "802.3", ETHERTYPE_8023, setipxframetype }, - { "snap", ETHERTYPE_SNAP, setipxframetype }, - { "EtherII", ETHERTYPE_II, setipxframetype }, + { "range", NEXTARG, 0, setatrange }, + { "phase", NEXTARG, 0, setatphase }, + { "snpaoffset", NEXTARG, 0, setsnpaoffset }, + { "nsellength", NEXTARG, 0, setnsellength }, + { "802.2", ETHERTYPE_8022, 0, setipxframetype }, + { "802.2tr", ETHERTYPE_8022TR, 0, setipxframetype }, + { "802.3", ETHERTYPE_8023, 0, setipxframetype }, + { "snap", ETHERTYPE_SNAP, 0, setipxframetype }, + { "EtherII", ETHERTYPE_II, 0, setipxframetype }, #endif /* INET_ONLY */ - { "link0", IFF_LINK0, setifflags } , - { "-link0", -IFF_LINK0, setifflags } , - { "link1", IFF_LINK1, setifflags } , - { "-link1", -IFF_LINK1, setifflags } , - { "link2", IFF_LINK2, setifflags } , - { "-link2", -IFF_LINK2, setifflags } , - { 0, 0, setifaddr }, - { 0, 0, setifdstaddr }, + { "link0", IFF_LINK0, 0, setifflags } , + { "-link0", -IFF_LINK0, 0, setifflags } , + { "link1", IFF_LINK1, 0, setifflags } , + { "-link1", -IFF_LINK1, 0, setifflags } , + { "link2", IFF_LINK2, 0, setifflags } , + { "-link2", -IFF_LINK2, 0, setifflags } , + { "media", NEXTARG, A_MEDIA, setmedia }, + { "mediaopt", NEXTARG, A_MEDIAOPTSET, setmediaopt }, + { "-mediaopt", NEXTARG, A_MEDIAOPTCLR, unsetmediaopt }, + { "instance", NEXTARG, A_MEDIAINST, setmediainst }, + { "inst", NEXTARG, A_MEDIAINST, setmediainst }, + { 0, 0, 0, setifaddr }, + { 0, 0, 0, setifdstaddr }, }; void adjust_nsellength(); @@ -170,6 +240,16 @@ void printb __P((char *, unsigned short, char *)); void status __P((int)); void usage(); +const char *get_media_type_string __P((int)); +const char *get_media_subtype_string __P((int)); +int get_media_subtype __P((int, const char *)); +int get_media_options __P((int, const char *)); +int lookup_media_word __P((struct ifmedia_description *, int, + const char *)); +void print_media_word __P((int, int, int)); +void process_media_commands __P((void)); +void init_current_media __P((void)); + /* * XNS support liberally adapted from code written at the University of * Maryland principally by James O'Toole and Chris Torek. @@ -231,8 +311,24 @@ main(argc, argv) else if (!strcmp(*argv, "-A")) { aflag = 1; ifaliases = 1; + } + else if (!strcmp(*argv, "-ma") || !strcmp(*argv, "-am")) { + aflag = 1; + mflag = 1; + } + else if (!strcmp(*argv, "-mA") || !strcmp(*argv, "-Am")) { + aflag = 1; + ifaliases = 1; + mflag = 1; + } + else if (!strcmp(*argv, "-m")) { + mflag = 1; + argc--, argv++; + if (argc < 1) + usage(); + strncpy(name, *argv, sizeof(name) - 1); } else - strncpy(name, *argv, sizeof(name)); + strncpy(name, *argv, sizeof(name) - 1); argc--, argv++; if (argc > 0) { for (afp = rafp = afs; rafp->af_name; rafp++) @@ -249,7 +345,7 @@ main(argc, argv) printif(NULL, ifaliases); exit(0); } - strncpy(ifr.ifr_name, name, sizeof(ifr.ifr_name)); + strncpy(ifr.ifr_name, name, sizeof ifr.ifr_name); if (argc == 0) { printif(&ifr, 1); exit(0); @@ -274,10 +370,14 @@ main(argc, argv) argc--, argv++; } else (*p->c_func)(*argv, p->c_parameter); + actions |= p->c_action; } argc--, argv++; } + /* Process any media commands that may have been issued. */ + process_media_commands(); + #ifndef INET_ONLY switch (af) { @@ -552,6 +652,296 @@ setifmetric(val) warn("SIOCSIFMETRIC"); } +void +init_current_media() +{ + struct ifmediareq ifmr; + + /* + * If we have not yet done so, grab the currently-selected + * media. + */ + if ((actions & (A_MEDIA|A_MEDIAOPT)) == 0) { + (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 we get E2BIG, the kernel is telling us + * that there are more, so we can ignore it. + */ + if (errno != E2BIG) + err(1, "SGIOCGIFMEDIA"); + } + + media_current = ifmr.ifm_current; + } + + /* Sanity. */ + if (IFM_TYPE(media_current) == 0) + errx(1, "%s: no link type?", name); +} + +void +process_media_commands() +{ + + if ((actions & (A_MEDIA|A_MEDIAOPT)) == 0) { + /* Nothing to do. */ + return; + } + + /* + * Media already set up, and commands sanity-checked. Set/clear + * any options, and we're ready to go. + */ + media_current |= mediaopt_set; + media_current &= ~mediaopt_clear; + + strncpy(ifr.ifr_name, name, sizeof(ifr.ifr_name)); + ifr.ifr_media = media_current; + + if (ioctl(s, SIOCSIFMEDIA, (caddr_t)&ifr) < 0) + err(1, "SIOCSIFMEDIA"); +} + +void +setmedia(val, d) + char *val; + int d; +{ + int type, subtype, inst; + + init_current_media(); + + /* Only one media command may be given. */ + if (actions & A_MEDIA) + errx(1, "only one `media' command may be issued"); + + /* Must not come after mediaopt commands */ + if (actions & A_MEDIAOPT) + errx(1, "may not issue `media' after `mediaopt' commands"); + + /* + * No need to check if `instance' has been issued; setmediainst() + * craps out if `media' has not been specified. + */ + + type = IFM_TYPE(media_current); + inst = IFM_INST(media_current); + + /* Look up the subtype. */ + subtype = get_media_subtype(type, val); + + /* Build the new current media word. */ + media_current = IFM_MAKEWORD(type, subtype, 0, inst); + + /* Media will be set after other processing is complete. */ +} + +void +setmediaopt(val, d) + char *val; + int d; +{ + + init_current_media(); + + /* Can only issue `mediaopt' once. */ + if (actions & A_MEDIAOPTSET) + errx(1, "only one `mediaopt' command may be issued"); + + /* Can't issue `mediaopt' if `instance' has already been issued. */ + if (actions & A_MEDIAINST) + errx(1, "may not issue `mediaopt' after `instance'"); + + mediaopt_set = get_media_options(IFM_TYPE(media_current), val); + + /* Media will be set after other processing is complete. */ +} + +void +unsetmediaopt(val, d) + char *val; + int d; +{ + + init_current_media(); + + /* Can only issue `-mediaopt' once. */ + if (actions & A_MEDIAOPTCLR) + errx(1, "only one `-mediaopt' command may be issued"); + + /* May not issue `media' and `-mediaopt'. */ + if (actions & A_MEDIA) + errx(1, "may not issue both `media' and `-mediaopt'"); + + /* + * No need to check for A_MEDIAINST, since the test for A_MEDIA + * implicitly checks for A_MEDIAINST. + */ + + mediaopt_clear = get_media_options(IFM_TYPE(media_current), val); + + /* Media will be set after other processing is complete. */ +} + +void +setmediainst(val, d) + char *val; + int d; +{ + int type, subtype, options, inst; + + init_current_media(); + + /* Can only issue `instance' once. */ + if (actions & A_MEDIAINST) + errx(1, "only one `instance' command may be issued"); + + /* Must have already specified `media' */ + if ((actions & A_MEDIA) == 0) + errx(1, "must specify `media' before `instance'"); + + type = IFM_TYPE(media_current); + subtype = IFM_SUBTYPE(media_current); + options = IFM_OPTIONS(media_current); + + inst = atoi(val); + if (inst < 0 || inst > IFM_INST_MAX) + errx(1, "invalid media instance: %s", val); + + media_current = IFM_MAKEWORD(type, subtype, options, inst); + + /* Media will be set after other processing is complete. */ +} + +struct ifmedia_description ifm_type_descriptions[] = + IFM_TYPE_DESCRIPTIONS; + +struct ifmedia_description ifm_subtype_descriptions[] = + IFM_SUBTYPE_DESCRIPTIONS; + +struct ifmedia_description ifm_option_descriptions[] = + IFM_OPTION_DESCRIPTIONS; + +const char * +get_media_type_string(mword) + int mword; +{ + struct ifmedia_description *desc; + + for (desc = ifm_type_descriptions; desc->ifmt_string != NULL; + desc++) { + if (IFM_TYPE(mword) == desc->ifmt_word) + return (desc->ifmt_string); + } + return ("<unknown type>"); +} + +const char * +get_media_subtype_string(mword) + int mword; +{ + struct ifmedia_description *desc; + + for (desc = ifm_subtype_descriptions; desc->ifmt_string != NULL; + desc++) { + if (IFM_TYPE_MATCH(desc->ifmt_word, mword) && + IFM_SUBTYPE(desc->ifmt_word) == IFM_SUBTYPE(mword)) + return (desc->ifmt_string); + } + return ("<unknown subtype>"); +} + +int +get_media_subtype(type, val) + int type; + const char *val; +{ + int rval; + + rval = lookup_media_word(ifm_subtype_descriptions, type, val); + if (rval == -1) + errx(1, "unknown %s media subtype: %s", + get_media_type_string(type), val); + + return (rval); +} + +int +get_media_options(type, val) + int type; + const char *val; +{ + char *optlist, *str; + int option, rval = 0; + + /* We muck with the string, so copy it. */ + optlist = strdup(val); + if (optlist == NULL) + err(1, "strdup"); + str = optlist; + + /* + * Look up the options in the user-provided comma-separated list. + */ + for (; (str = strtok(str, ",")) != NULL; str = NULL) { + option = lookup_media_word(ifm_option_descriptions, type, str); + if (option == -1) + errx(1, "unknown %s media option: %s", + get_media_type_string(type), str); + rval |= option; + } + + free(optlist); + return (rval); +} + +int +lookup_media_word(desc, type, val) + struct ifmedia_description *desc; + int type; + const char *val; +{ + + for (; desc->ifmt_string != NULL; desc++) { + if (IFM_TYPE_MATCH(desc->ifmt_word, type) && + strcasecmp(desc->ifmt_string, val) == 0) + return (desc->ifmt_word); + } + return (-1); +} + +void +print_media_word(ifmw, print_type, as_syntax) + int ifmw, print_type, as_syntax; +{ + struct ifmedia_description *desc; + int seen_option = 0; + + if (print_type) + printf("%s ", get_media_type_string(ifmw)); + printf("%s%s", as_syntax ? "media " : "", + get_media_subtype_string(ifmw)); + + /* Find options. */ + for (desc = ifm_option_descriptions; desc->ifmt_string != NULL; + desc++) { + if (IFM_TYPE_MATCH(desc->ifmt_word, ifmw) && + (ifmw & desc->ifmt_word) != 0 && + (seen_option & IFM_OPTIONS(desc->ifmt_word)) == 0) { + if (seen_option == 0) + printf(" %s", as_syntax ? "mediaopt " : ""); + printf("%s%s", seen_option ? "," : "", + desc->ifmt_string); + seen_option |= IFM_OPTIONS(desc->ifmt_word); + } + } + if (IFM_INST(ifmw) != 0) + printf(" instance %d", IFM_INST(ifmw)); +} + #define IFFBITS \ "\020\1UP\2BROADCAST\3DEBUG\4LOOPBACK\5POINTOPOINT\6NOTRAILERS\7RUNNING\10NOARP\ \11PROMISC\12ALLMULTI\13OACTIVE\14SIMPLEX\15LINK0\16LINK1\17LINK2\20MULTICAST" @@ -565,12 +955,86 @@ status(link) int link; { register struct afswtch *p = afp; + struct ifmediareq ifmr; + int *media_list, i; printf("%s: ", name); printb("flags", flags, IFFBITS); if (metric) printf(" metric %d", metric); putchar('\n'); + + (void) memset(&ifmr, 0, sizeof(ifmr)); + (void) strncpy(ifmr.ifm_name, name, sizeof(ifmr.ifm_name)); + + if (ioctl(s, SIOCGIFMEDIA, (caddr_t)&ifmr) < 0) { + /* + * Interface doesn't support SIOC{G,S}IFMEDIA. + */ + goto proto_status; + } + + media_list = (int *)malloc(ifmr.ifm_count * sizeof(int)); + if (media_list == NULL) + err(1, "malloc"); + ifmr.ifm_ulist = media_list; + + if (ioctl(s, SIOCGIFMEDIA, (caddr_t)&ifmr) < 0) + err(1, "SIOCGIFMEDIA"); + printf("\tmedia: "); + print_media_word(ifmr.ifm_current, 1, 0); + if (ifmr.ifm_active != ifmr.ifm_current) { + putchar(' '); + putchar('('); + print_media_word(ifmr.ifm_active, 0, 0); + putchar(')'); + } + putchar('\n'); + + if (ifmr.ifm_status & IFM_AVALID) { + printf("\tstatus: "); + switch (IFM_TYPE(ifmr.ifm_active)) { + case IFM_ETHER: + if (ifmr.ifm_status & IFM_ACTIVE) + printf("active"); + else + printf("no carrier"); + break; + + case IFM_FDDI: + case IFM_TOKEN: + if (ifmr.ifm_status & IFM_ACTIVE) + printf("inserted"); + else + printf("no ring"); + break; + default: + printf("unknown"); + } + putchar('\n'); + } + + if (mflag) { + int type, printed_type = 0; + + for (type = IFM_NMIN; type <= IFM_NMAX; type += IFM_NMIN) { + for (i = 0, printed_type = 0; i < ifmr.ifm_count; i++) { + if (IFM_TYPE(media_list[i]) == type) { + if (printed_type == 0) { + printf("\tsupported media:\n"); + printed_type = 1; + } + printf("\t\t"); + print_media_word(media_list[i], 0, 1); + printf("\n"); + } + } + } + } + + free(media_list); + + proto_status: if (link == 0) { if ((p = afp) != NULL) { (*p->af_status)(1); diff --git a/sys/conf/files b/sys/conf/files index 6eae00fc325..403b956a7d4 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1,4 +1,4 @@ -# $OpenBSD: files,v 1.86 1998/08/30 17:11:32 art Exp $ +# $OpenBSD: files,v 1.87 1998/09/03 06:24:19 jason Exp $ # $NetBSD: files,v 1.87 1996/05/19 17:17:50 jonathan Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 @@ -269,6 +269,7 @@ file net/if_atmsubr.c atm needs-flag file net/if_ethersubr.c ether | fddi needs-flag file net/if_fddisubr.c fddi file net/if_loop.c loop needs-count +file net/if_media.c file net/if_sl.c sl needs-count file net/if_strip.c strip needs-count file net/if_ppp.c ppp needs-count diff --git a/sys/dev/pci/if_xl.c b/sys/dev/pci/if_xl.c index 10ca3e6c622..850390a36c0 100644 --- a/sys/dev/pci/if_xl.c +++ b/sys/dev/pci/if_xl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_xl.c,v 1.3 1998/09/02 06:04:47 jason Exp $ */ +/* $OpenBSD: if_xl.c,v 1.4 1998/09/03 06:24:19 jason Exp $ */ /* * Copyright (c) 1997, 1998 @@ -107,10 +107,11 @@ #include <net/if_arp.h> #include <net/ethernet.h> #include <net/if_dl.h> -#include <net/if_media.h> #elif defined(__OpenBSD__) +#define bootverbose 0 + #include <net/if.h> #include <net/if_dl.h> #include <net/if_types.h> @@ -129,6 +130,8 @@ #endif +#include <net/if_media.h> + #if NBPFILTER > 0 #include <net/bpf.h> #endif @@ -162,7 +165,7 @@ #if !defined(lint) && !defined(__OpenBSD__) static char rcsid[] = - "$Id: if_xl.c,v 1.3 1998/09/02 06:04:47 jason Exp $"; + "$Id: if_xl.c,v 1.4 1998/09/03 06:24:19 jason Exp $"; #endif #ifdef __FreeBSD__ @@ -188,6 +191,7 @@ static struct xl_type xl_devs[] = { "3Com 3c905B Fast Etherlink XL 10/100BaseT4" }, { 0, 0, NULL } }; +#endif /* * Various supported PHY vendors/types and their names. Note that @@ -204,17 +208,11 @@ static struct xl_type xl_phys[] = { { SEEQ_PHY_VENDORID, SEEQ_PHY_80220, "<SEEQ 80220>" }, { 0, 0, "<MII-compliant physical interface>" } }; -#endif #if defined(__FreeBSD__) static unsigned long xl_count = 0; static char *xl_probe __P((pcici_t, pcidi_t)); static void xl_attach __P((pcici_t, int)); -static int xl_ifmedia_upd __P((struct ifnet *)); -static void xl_ifmedia_sts __P((struct ifnet *, struct ifmediareq *)); -static void xl_setmode_mii __P((struct xl_softc *, int)); -static void xl_getmode_mii __P((struct xl_softc *)); -static void xl_setmode __P((struct xl_softc *, int)); static void xl_intr __P((void *)); static void xl_shutdown __P((int, void *)); #elif defined(__OpenBSD__) @@ -241,7 +239,12 @@ static void xl_watchdog __P((struct ifnet *)); static u_int8_t xl_calchash __P((u_int8_t *)); static void xl_mediacheck __P((struct xl_softc *)); static void xl_autoneg_mii __P((struct xl_softc *, int, int)); +static void xl_setmode_mii __P((struct xl_softc *, int)); +static void xl_ifmedia_sts __P((struct ifnet *, struct ifmediareq *)); +static void xl_getmode_mii __P((struct xl_softc *)); static void xl_autoneg_xmit __P((struct xl_softc *)); +static int xl_ifmedia_upd __P((struct ifnet *)); +static void xl_setmode __P((struct xl_softc *, int)); static int xl_eeprom_wait __P((struct xl_softc *)); static int xl_read_eeprom __P((struct xl_softc *, caddr_t, int, @@ -812,11 +815,9 @@ static void xl_autoneg_mii(sc, flag, verbose) { u_int16_t phy_sts = 0, media, advert, ability; struct ifnet *ifp; -#ifndef __OpenBSD__ struct ifmedia *ifm; ifm = &sc->ifmedia; -#endif ifp = &sc->arpcom.ac_if; /* @@ -897,41 +898,31 @@ static void xl_autoneg_mii(sc, flag, verbose) ability = xl_phy_readreg(sc, XL_PHY_LPAR); if (advert & PHY_ANAR_100BT4 && ability & PHY_ANAR_100BT4) { -#ifndef __OpenBSD__ ifm->ifm_media = IFM_ETHER|IFM_100_T4; -#endif media |= PHY_BMCR_SPEEDSEL; media &= ~PHY_BMCR_DUPLEX; printf("(100baseT4)\n"); } else if (advert & PHY_ANAR_100BTXFULL && ability & PHY_ANAR_100BTXFULL) { -#ifndef __OpenBSD__ ifm->ifm_media = IFM_ETHER|IFM_100_TX|IFM_FDX; -#endif media |= PHY_BMCR_SPEEDSEL; media |= PHY_BMCR_DUPLEX; printf("(full-duplex, 100Mbps)\n"); } else if (advert & PHY_ANAR_100BTXHALF && ability & PHY_ANAR_100BTXHALF) { -#ifndef __OpenBSD__ ifm->ifm_media = IFM_ETHER|IFM_100_TX|IFM_HDX; -#endif media |= PHY_BMCR_SPEEDSEL; media &= ~PHY_BMCR_DUPLEX; printf("(half-duplex, 100Mbps)\n"); } else if (advert & PHY_ANAR_10BTFULL && ability & PHY_ANAR_10BTFULL) { -#ifndef __OpenBSD__ ifm->ifm_media = IFM_ETHER|IFM_10_T|IFM_FDX; -#endif media &= ~PHY_BMCR_SPEEDSEL; media |= PHY_BMCR_DUPLEX; printf("(full-duplex, 10Mbps)\n"); } else if (advert & PHY_ANAR_10BTHALF && ability & PHY_ANAR_10BTHALF) { -#ifndef __OpenBSD__ ifm->ifm_media = IFM_ETHER|IFM_10_T|IFM_HDX; -#endif media &= ~PHY_BMCR_SPEEDSEL; media &= ~PHY_BMCR_DUPLEX; printf("(half-duplex, 10Mbps)\n"); @@ -962,7 +953,6 @@ static void xl_autoneg_mii(sc, flag, verbose) return; } -#ifdef __FreeBSD__ static void xl_getmode_mii(sc) struct xl_softc *sc; { @@ -1199,7 +1189,6 @@ static void xl_setmode(sc, media) return; } -#endif static void xl_reset(sc) struct xl_softc *sc; @@ -2494,7 +2483,6 @@ static void xl_init(xsc) return; } -#ifdef __FreeBSD__ /* * Set media options. */ @@ -2605,7 +2593,6 @@ static void xl_ifmedia_sts(ifp, ifmr) return; } -#endif static int xl_ioctl(ifp, command, data) struct ifnet *ifp; @@ -2613,11 +2600,8 @@ static int xl_ioctl(ifp, command, data) caddr_t data; { struct xl_softc *sc = ifp->if_softc; -#if defined(__FreeBSD__) struct ifreq *ifr = (struct ifreq *) data; -#else struct ifaddr *ifa = (struct ifaddr *)data; -#endif int s, error = 0; s = splimp(); @@ -2669,12 +2653,10 @@ static int xl_ioctl(ifp, command, data) xl_setmulti(sc); error = 0; break; -#ifdef __FreeBSD__ case SIOCGIFMEDIA: case SIOCSIFMEDIA: error = ifmedia_ioctl(ifp, ifr, &sc->ifmedia, command); break; -#endif default: error = EINVAL; break; @@ -2840,13 +2822,31 @@ xl_attach(parent, self, aux) bus_addr_t iobase; bus_size_t iosize; u_int32_t command; - u_int16_t phy_sts; + u_int16_t phy_sts, phy_vid, phy_did; caddr_t roundptr; u_int round; - int i; + int i, media = IFM_ETHER|IFM_100_TX|IFM_FDX; + struct xl_type *p; sc->xl_unit = sc->sc_dev.dv_unit; + /* + * If this is a 3c905B, we have to check one extra thing. + * The 905B supports power management and may be placed in + * a low-power mode (D3 mode), typically by certain operating + * systems which shall not be named. The PCI BIOS is supposed + * to reset the NIC and bring it out of low-power mode, but + * some do not. Consequently, we have to see if this chip + * supports power management, and if so, make sure it's not + * in low-power mode. If power management is available, the + * capid byte will be 0x01. + * + * I _think_ that what actually happens is that the chip + * loses its PCI configuration during the transition from + * D3 back to D0; this means that it should be possible for + * us to save the PCI iobase, membase and IRQ, put the chip + * back in the D0 state, then restore the PCI config ourselves. + */ command = pci_conf_read(pa->pa_pc, pa->pa_tag, XL_PCI_CAPID) & 0xff; if (command == 0x01) { @@ -2911,25 +2911,11 @@ xl_attach(parent, self, aux) return; } - bcopy(sc->sc_dev.dv_xname, ifp->if_xname, IFNAMSIZ); - ifp->if_softc = sc; - ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; - ifp->if_ioctl = xl_ioctl; - ifp->if_start = xl_start; - ifp->if_watchdog = xl_watchdog; - - printf(": %s\n", intrstr); - - if_attach(ifp); - ether_ifattach(ifp); -#if NBPFILTER > 0 - bpfattach(&sc->arpcom.ac_if.if_bpf, ifp, DLT_EN10MB, - sizeof(struct ether_header)); -#endif - shutdownhook_establish(xl_shutdown, sc); - xl_reset(sc); + /* + * Get station address from the EEPROM. + */ if (xl_read_eeprom(sc, (caddr_t)&enaddr, XL_EE_OEM_ADR0, 3, 1)) { printf("%s: failed to read station address\n", sc->sc_dev.dv_xname); @@ -2937,8 +2923,7 @@ xl_attach(parent, self, aux) } bcopy(enaddr, (char *)&sc->arpcom.ac_enaddr, ETHER_ADDR_LEN); - printf(" address %s\n", sc->sc_dev.dv_xname, - ether_sprintf(sc->arpcom.ac_enaddr)); + printf(" address %s\n", ether_sprintf(sc->arpcom.ac_enaddr)); sc->xl_ldata_ptr = malloc(sizeof(struct xl_list_data) + 8, M_DEVBUF, M_NOWAIT); @@ -2960,6 +2945,21 @@ xl_attach(parent, self, aux) sc->xl_ldata = (struct xl_list_data *)roundptr; bzero(sc->xl_ldata, sizeof(struct xl_list_data)); + ifp->if_softc = sc; + ifp->if_mtu = ETHERMTU; + ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; + ifp->if_ioctl = xl_ioctl; + ifp->if_output = ether_output; + ifp->if_start = xl_start; + ifp->if_watchdog = xl_watchdog; + ifp->if_baudrate = 10000000; + bcopy(sc->sc_dev.dv_xname, ifp->if_xname, IFNAMSIZ); + + /* + * Figure out the card type. 3c905B adapters have the + * 'supportsNoTxLength' bit set in the capabilities + * word in the EEPROM. + */ xl_read_eeprom(sc, (caddr_t)&sc->xl_caps, XL_EE_CAPS, 1, 0); if (sc->xl_caps & XL_CAPS_NO_TXLENGTH) sc->xl_type = XL_TYPE_905B; @@ -2968,6 +2968,9 @@ xl_attach(parent, self, aux) XL_SEL_WIN(3); sc->xl_media = CSR_READ_2(sc, XL_W3_MEDIA_OPT); + if (bootverbose) + printf("xl%d: media options word: %x\n", + sc->xl_unit, sc->xl_media); xl_mediacheck(sc); xl_read_eeprom(sc, (char *)&sc->xl_xcvr, XL_EE_ICFG_0, 2, 0); @@ -3004,14 +3007,145 @@ xl_attach(parent, self, aux) if ((phy_sts = xl_phy_readreg(sc, XL_PHY_GENSTS))) break; } - if (!phy_sts) { + if (phy_sts) { + phy_vid = xl_phy_readreg(sc, XL_PHY_VENID); + phy_did = xl_phy_readreg(sc, XL_PHY_DEVID); + if (bootverbose) + printf("xl%d: found PHY at address %d, ", + sc->xl_unit, sc->xl_phy_addr); + if (bootverbose) + printf("vendor id: %x device id: %x\n", + phy_vid, phy_did); + p = xl_phys; + while(p->xl_vid) { + if (phy_vid == p->xl_vid && + (phy_did | 0x000F) == p->xl_did) { + sc->xl_pinfo = p; + break; + } + p++; + } + if (sc->xl_pinfo == NULL) + sc->xl_pinfo = &xl_phys[PHY_UNKNOWN]; + if (bootverbose) + printf("xl%d: PHY type: %s\n", + sc->xl_unit, sc->xl_pinfo->xl_name); + } + else { printf("%s: MII without any phy!\n", sc->sc_dev.dv_xname); } } - if (sc->xl_xcvr == XL_XCVR_AUTO || sc->xl_xcvr == XL_XCVR_MII) + /* + * Do ifmedia setup. + */ + ifmedia_init(&sc->ifmedia, 0, xl_ifmedia_upd, xl_ifmedia_sts); + + if (sc->xl_media & XL_MEDIAOPT_BT) { + if (bootverbose) + printf("xl%d: found 10baseT\n", sc->xl_unit); + ifmedia_add(&sc->ifmedia, IFM_ETHER|IFM_10_T, 0, NULL); + ifmedia_add(&sc->ifmedia, IFM_ETHER|IFM_10_T|IFM_HDX, 0, NULL); + if (sc->xl_caps & XL_CAPS_FULL_DUPLEX) + ifmedia_add(&sc->ifmedia, + IFM_ETHER|IFM_10_T|IFM_FDX, 0, NULL); + } + + if (sc->xl_media & XL_MEDIAOPT_AUI) { + if (bootverbose) + printf("xl%d: found AUI\n", sc->xl_unit); + ifmedia_add(&sc->ifmedia, IFM_ETHER|IFM_10_5, 0, NULL); + } + + if (sc->xl_media & XL_MEDIAOPT_BNC) { + if (bootverbose) + printf("xl%d: found BNC\n", sc->xl_unit); + ifmedia_add(&sc->ifmedia, IFM_ETHER|IFM_10_2, 0, NULL); + } + + /* + * Technically we could use xl_getmode_mii() to scan the + * modes, but the built-in BTX mode on the 3c905B implies + * 10/100 full/half duplex support anyway, so why not just + * do it and get it over with. + */ + if (sc->xl_media & XL_MEDIAOPT_BTX) { + if (bootverbose) + printf("xl%d: found 100baseTX\n", sc->xl_unit); + ifp->if_baudrate = 100000000; + ifmedia_add(&sc->ifmedia, IFM_ETHER|IFM_100_TX, 0, NULL); + ifmedia_add(&sc->ifmedia, + IFM_ETHER|IFM_100_TX|IFM_HDX, 0, NULL); + if (sc->xl_caps & XL_CAPS_FULL_DUPLEX) + ifmedia_add(&sc->ifmedia, + IFM_ETHER|IFM_100_TX|IFM_FDX, 0, NULL); + if (sc->xl_pinfo != NULL) + ifmedia_add(&sc->ifmedia, IFM_ETHER|IFM_AUTO, 0, NULL); + } + + if (sc->xl_media & XL_MEDIAOPT_BFX) { + if (bootverbose) + printf("xl%d: found 100baseFX\n", sc->xl_unit); + ifp->if_baudrate = 100000000; + ifmedia_add(&sc->ifmedia, IFM_ETHER|IFM_100_FX, 0, NULL); + } + + /* + * If there's an MII, we have to probe its modes + * separately. + */ + if (sc->xl_media & XL_MEDIAOPT_MII || sc->xl_media & XL_MEDIAOPT_BT4) { + if (bootverbose) + printf("xl%d: found MII\n", sc->xl_unit); + xl_getmode_mii(sc); + } + + /* Choose a default media. */ + switch(sc->xl_xcvr) { + case XL_XCVR_10BT: + media = IFM_ETHER|IFM_10_T; + xl_setmode(sc, media); + break; + case XL_XCVR_AUI: + media = IFM_ETHER|IFM_10_5; + xl_setmode(sc, media); + break; + case XL_XCVR_COAX: + media = IFM_ETHER|IFM_10_2; + xl_setmode(sc, media); + break; + case XL_XCVR_AUTO: + media = IFM_ETHER|IFM_AUTO; xl_autoneg_mii(sc, XL_FLAG_SCHEDDELAY, 1); + break; + case XL_XCVR_100BTX: + case XL_XCVR_MII: + media = sc->ifmedia.ifm_media; + xl_autoneg_mii(sc, XL_FLAG_SCHEDDELAY, 1); + break; + case XL_XCVR_100BFX: + media = IFM_ETHER|IFM_100_FX; + break; + default: + printf("xl%d: unknown XCVR type: %d\n", sc->xl_unit, + sc->xl_xcvr); + break; + } + + ifmedia_set(&sc->ifmedia, media); + + /* + * Call MI attach routines. + */ + if_attach(ifp); + ether_ifattach(ifp); + +#if NBPFILTER > 0 + bpfattach(&sc->arpcom.ac_if.if_bpf, ifp, + DLT_EN10MB, sizeof(struct ether_header)); +#endif + shutdownhook_establish(xl_shutdown, sc); } static void diff --git a/sys/dev/pci/if_xlreg.h b/sys/dev/pci/if_xlreg.h index 0d0aa660229..f921fb0503f 100644 --- a/sys/dev/pci/if_xlreg.h +++ b/sys/dev/pci/if_xlreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_xlreg.h,v 1.2 1998/09/02 06:04:48 jason Exp $ */ +/* $OpenBSD: if_xlreg.h,v 1.3 1998/09/03 06:24:20 jason Exp $ */ /* * Copyright (c) 1997, 1998 @@ -545,9 +545,7 @@ struct xl_softc { bus_space_handle_t sc_sh; /* bus space handle */ #endif struct arpcom arpcom; /* interface info */ -#ifdef __FreeBSD__ struct ifmedia ifmedia; /* media info */ -#endif u_int32_t iobase; /* pointer to PIO space */ #ifndef XL_USEIOSPACE volatile caddr_t csr; /* pointer to register map */ diff --git a/sys/net/if.h b/sys/net/if.h index 3bff4b18c66..a9893df142e 100644 --- a/sys/net/if.h +++ b/sys/net/if.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if.h,v 1.7 1996/07/02 06:52:04 niklas Exp $ */ +/* $OpenBSD: if.h,v 1.8 1998/09/03 06:24:20 jason Exp $ */ /* $NetBSD: if.h,v 1.23 1996/05/07 02:40:27 thorpej Exp $ */ /* @@ -291,6 +291,7 @@ struct ifreq { #define ifr_broadaddr ifr_ifru.ifru_broadaddr /* broadcast address */ #define ifr_flags ifr_ifru.ifru_flags /* flags */ #define ifr_metric ifr_ifru.ifru_metric /* metric */ +#define ifr_media ifr_ifru.ifru_metric /* media options (overload) */ #define ifr_data ifr_ifru.ifru_data /* for use by interface */ }; @@ -302,6 +303,17 @@ struct ifaliasreq { struct sockaddr ifra_mask; }; +struct ifmediareq { + char ifm_name[IFNAMSIZ]; /* if name, e.g. "en0" */ + int ifm_current; /* current media options */ + int ifm_mask; /* don't care mask */ + int ifm_status; /* media status */ + int ifm_active; /* active options */ + int ifm_count; /* # entries in ifm_ulist + array */ + int *ifm_ulist; /* media words */ +}; + /* * Structure used in SIOCGIFCONF request. * Used to retrieve interface configuration diff --git a/sys/net/if_media.c b/sys/net/if_media.c new file mode 100644 index 00000000000..29246f2d800 --- /dev/null +++ b/sys/net/if_media.c @@ -0,0 +1,456 @@ +/* $OpenBSD: if_media.c,v 1.1 1998/09/03 06:24:20 jason Exp $ */ +/* $NetBSD: if_media.c,v 1.3 1998/08/30 07:39:39 enami Exp $ */ + +/*- + * Copyright (c) 1998 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility, + * NASA Ames Research Center. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the NetBSD + * Foundation, Inc. and its contributors. + * 4. Neither the name of The NetBSD Foundation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +/* + * Copyright (c) 1997 + * Jonathan Stone and Jason R. Thorpe. All rights reserved. + * + * This software is derived from information provided by Matt Thomas. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by Jonathan Stone + * and Jason R. Thorpe for the NetBSD Project. + * 4. The names of the authors may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +/* + * BSD/OS-compatible network interface media selection. + * + * Where it is safe to do so, this code strays slightly from the BSD/OS + * design. Software which uses the API (device drivers, basically) + * shouldn't notice any difference. + * + * Many thanks to Matt Thomas for providing the information necessary + * to implement this interface. + */ + +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/errno.h> +#include <sys/ioctl.h> +#include <sys/socket.h> +#include <sys/malloc.h> + +#include <net/if.h> +#include <net/if_media.h> +#include <net/netisr.h> + +/* + * Compile-time options: + * IFMEDIA_DEBUG: + * turn on implementation-level debug printfs. + * Useful for debugging newly-ported drivers. + */ + +struct ifmedia_entry *ifmedia_match __P((struct ifmedia *ifm, + int flags, int mask)); + +#ifdef IFMEDIA_DEBUG +int ifmedia_debug = 0; +static void ifmedia_printword __P((int)); +#endif + +/* + * Initialize if_media struct for a specific interface instance. + */ +void +ifmedia_init(ifm, dontcare_mask, change_callback, status_callback) + struct ifmedia *ifm; + int dontcare_mask; + ifm_change_cb_t change_callback; + ifm_stat_cb_t status_callback; +{ + + LIST_INIT(&ifm->ifm_list); + ifm->ifm_cur = NULL; + ifm->ifm_media = 0; + ifm->ifm_mask = dontcare_mask; /* IF don't-care bits */ + ifm->ifm_change = change_callback; + ifm->ifm_status = status_callback; +} + +/* + * Add a media configuration to the list of supported media + * for a specific interface instance. + */ +void +ifmedia_add(ifm, mword, data, aux) + struct ifmedia *ifm; + int mword; + int data; + void *aux; +{ + register struct ifmedia_entry *entry; + +#ifdef IFMEDIA_DEBUG + if (ifmedia_debug) { + if (ifm == NULL) { + printf("ifmedia_add: null ifm\n"); + return; + } + printf("Adding entry for "); + ifmedia_printword(mword); + } +#endif + + entry = malloc(sizeof(*entry), M_IFADDR, M_NOWAIT); + if (entry == NULL) + panic("ifmedia_add: can't malloc entry"); + + entry->ifm_media = mword; + entry->ifm_data = data; + entry->ifm_aux = aux; + + LIST_INSERT_HEAD(&ifm->ifm_list, entry, ifm_list); +} + +/* + * Add an array of media configurations to the list of + * supported media for a specific interface instance. + */ +void +ifmedia_list_add(ifm, lp, count) + struct ifmedia *ifm; + struct ifmedia_entry *lp; + int count; +{ + int i; + + for (i = 0; i < count; i++) + ifmedia_add(ifm, lp[i].ifm_media, lp[i].ifm_data, + lp[i].ifm_aux); +} + +/* + * Set the default active media. + * + * Called by device-specific code which is assumed to have already + * selected the default media in hardware. We do _not_ call the + * media-change callback. + */ +void +ifmedia_set(ifm, target) + struct ifmedia *ifm; + int target; + +{ + struct ifmedia_entry *match; + + match = ifmedia_match(ifm, target, ifm->ifm_mask); + + if (match == NULL) { + printf("ifmedia_set: no match for 0x%x/0x%x\n", + target, ~ifm->ifm_mask); + panic("ifmedia_set"); + } + ifm->ifm_cur = match; + +#ifdef IFMEDIA_DEBUG + if (ifmedia_debug) { + printf("ifmedia_set: target "); + ifmedia_printword(target); + printf("ifmedia_set: setting to "); + ifmedia_printword(ifm->ifm_cur->ifm_media); + } +#endif +} + +/* + * Device-independent media ioctl support function. + */ +int +ifmedia_ioctl(ifp, ifr, ifm, cmd) + struct ifnet *ifp; + struct ifreq *ifr; + struct ifmedia *ifm; + u_long cmd; +{ + struct ifmedia_entry *match; + struct ifmediareq *ifmr = (struct ifmediareq *) ifr; + int error = 0, sticky; + + if (ifp == NULL || ifr == NULL || ifm == NULL) + return(EINVAL); + + switch (cmd) { + + /* + * Set the current media. + */ + case SIOCSIFMEDIA: + { + struct ifmedia_entry *oldentry; + int oldmedia; + int newmedia = ifr->ifr_media; + + match = ifmedia_match(ifm, newmedia, ifm->ifm_mask); + if (match == NULL) { +#ifdef IFMEDIA_DEBUG + if (ifmedia_debug) { + printf( + "ifmedia_ioctl: no media found for 0x%x\n", + newmedia); + } +#endif + return (ENXIO); + } + + /* + * If no change, we're done. + * XXX Automedia may invole software intervention. + * Keep going in case the the connected media changed. + * Similarly, if best match changed (kernel debugger?). + */ + if ((IFM_SUBTYPE(newmedia) != IFM_AUTO) && + (newmedia == ifm->ifm_media) && + (match == ifm->ifm_cur)) + return 0; + + /* + * We found a match, now make the driver switch to it. + * Make sure to preserve our old media type in case the + * driver can't switch. + */ +#ifdef IFMEDIA_DEBUG + if (ifmedia_debug) { + printf("ifmedia_ioctl: switching %s to ", + ifp->if_xname); + ifmedia_printword(match->ifm_media); + } +#endif + oldentry = ifm->ifm_cur; + oldmedia = ifm->ifm_media; + ifm->ifm_cur = match; + ifm->ifm_media = newmedia; + error = (*ifm->ifm_change)(ifp); + if (error) { + ifm->ifm_cur = oldentry; + ifm->ifm_media = oldmedia; + } + break; + } + + /* + * Get list of available media and current media on interface. + */ + case SIOCGIFMEDIA: + { + struct ifmedia_entry *ep; + int *kptr, count; + + kptr = NULL; /* XXX gcc */ + + ifmr->ifm_active = ifmr->ifm_current = ifm->ifm_cur ? + ifm->ifm_cur->ifm_media : IFM_NONE; + ifmr->ifm_mask = ifm->ifm_mask; + ifmr->ifm_status = 0; + (*ifm->ifm_status)(ifp, ifmr); + + count = 0; + ep = ifm->ifm_list.lh_first; + + if (ifmr->ifm_count != 0) { + kptr = (int *)malloc(ifmr->ifm_count * sizeof(int), + M_TEMP, M_WAITOK); + + /* + * Get the media words from the interface's list. + */ + for (; ep != NULL && count < ifmr->ifm_count; + ep = ep->ifm_list.le_next, count++) + kptr[count] = ep->ifm_media; + + if (ep != NULL) + error = E2BIG; /* oops! */ + } + + /* + * If there are more interfaces on the list, count + * them. This allows the caller to set ifmr->ifm_count + * to 0 on the first call to know how much space to + * callocate. + */ + for (; ep != NULL; ep = ep->ifm_list.le_next) + count++; + + /* + * We do the copyout on E2BIG, because that's + * just our way of telling userland that there + * are more. This is the behavior I've observed + * under BSD/OS 3.0 + */ + sticky = error; + if ((error == 0 || error == E2BIG) && ifmr->ifm_count != 0) { + error = copyout((caddr_t)kptr, + (caddr_t)ifmr->ifm_ulist, + ifmr->ifm_count * sizeof(int)); + } + + if (error == 0) + error = sticky; + + if (ifmr->ifm_count != 0) + free(kptr, M_TEMP); + + ifmr->ifm_count = count; + break; + } + + default: + return (EINVAL); + } + + return (error); +} + +/* + * Find media entry matching a given ifm word. + * + */ +struct ifmedia_entry * +ifmedia_match(ifm, target, mask) + struct ifmedia *ifm; + int target; + int mask; +{ + struct ifmedia_entry *match, *next; + + match = NULL; + mask = ~mask; + + for (next = ifm->ifm_list.lh_first; next != NULL; + next = next->ifm_list.le_next) { + if ((next->ifm_media & mask) == (target & mask)) { +#if defined(IFMEDIA_DEBUG) || defined(DIAGNOSTIC) + if (match) { + printf("ifmedia_match: multiple match for " + "0x%x/0x%x\n", target, mask); + } +#endif + match = next; + } + } + + return match; +} + +#ifdef IFMEDIA_DEBUG + +struct ifmedia_description ifm_type_descriptions[] = + IFM_TYPE_DESCRIPTIONS; + +struct ifmedia_description ifm_subtype_descriptions[] = + IFM_SUBTYPE_DESCRIPTIONS; + +struct ifmedia_description ifm_option_descriptions[] = + IFM_OPTION_DESCRIPTIONS; + +/* + * print a media word. + */ +static void +ifmedia_printword(ifmw) + int ifmw; +{ + struct ifmedia_description *desc; + int seen_option = 0; + + /* Print the top-level interface type. */ + for (desc = ifm_type_descriptions; desc->ifmt_string != NULL; + desc++) { + if (IFM_TYPE(ifmw) == desc->ifmt_word) + break; + } + if (desc->ifmt_string == NULL) + printf("<unknown type> "); + else + printf("%s ", desc->ifmt_string); + + /* Print the subtype. */ + for (desc = ifm_subtype_descriptions; desc->ifmt_string != NULL; + desc++) { + if (IFM_TYPE_MATCH(desc->ifmt_word, ifmw) && + IFM_SUBTYPE(desc->ifmt_word) == IFM_SUBTYPE(ifmw)) + break; + } + if (desc->ifmt_string == NULL) + printf("<unknown subtype>"); + else + printf("%s", desc->ifmt_string); + + /* Print any options. */ + for (desc = ifm_option_descriptions; desc->ifmt_string != NULL; + desc++) { + if (IFM_TYPE_MATCH(desc->ifmt_word, ifmw) && + (ifmw & desc->ifmt_word) != 0 && + (seen_option & IFM_OPTIONS(desc->ifmt_word)) == 0) { + if (seen_option == 0) + printf(" <"); + printf("%s%s", seen_option ? "," : "", + desc->ifmt_string); + seen_option |= IFM_OPTIONS(desc->ifmt_word); + } + } + printf("%s\n", seen_option ? ">" : ""); +} + +#endif /* IFMEDIA_DEBUG */ diff --git a/sys/net/if_media.h b/sys/net/if_media.h new file mode 100644 index 00000000000..0d573003cc9 --- /dev/null +++ b/sys/net/if_media.h @@ -0,0 +1,356 @@ +/* $OpenBSD: if_media.h,v 1.1 1998/09/03 06:24:20 jason Exp $ */ +/* $NetBSD: if_media.h,v 1.11 1998/08/12 23:23:29 thorpej Exp $ */ + +/*- + * Copyright (c) 1998 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility, + * NASA Ames Research Center. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the NetBSD + * Foundation, Inc. and its contributors. + * 4. Neither the name of The NetBSD Foundation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +/* + * Copyright (c) 1997 + * Jonathan Stone and Jason R. Thorpe. All rights reserved. + * + * This software is derived from information provided by Matt Thomas. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by Jonathan Stone + * and Jason R. Thorpe for the NetBSD Project. + * 4. The names of the authors may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#ifndef _NET_IF_MEDIA_H_ +#define _NET_IF_MEDIA_H_ + +/* + * Prototypes and definitions for BSD/OS-compatible network interface + * media selection. + * + * Where it is safe to do so, this code strays slightly from the BSD/OS + * design. Software which uses the API (device drivers, basically) + * shouldn't notice any difference. + * + * Many thanks to Matt Thomas for providing the information necessary + * to implement this interface. + */ + +#ifdef _KERNEL + +#include <sys/queue.h> + +/* + * Driver callbacks for media status and change requests. + */ +typedef int (*ifm_change_cb_t) __P((struct ifnet *ifp)); +typedef void (*ifm_stat_cb_t) __P((struct ifnet *ifp, struct ifmediareq *req)); + +/* + * In-kernel representation of a single supported media type. + */ +struct ifmedia_entry { + LIST_ENTRY(ifmedia_entry) ifm_list; + int ifm_media; /* description of this media attachment */ + int ifm_data; /* for driver-specific use */ + void *ifm_aux; /* for driver-specific use */ +}; + +/* + * One of these goes into a network interface's softc structure. + * It is used to keep general media state. + */ +struct ifmedia { + int ifm_mask; /* mask of changes we don't care about */ + int ifm_media; /* current user-set media word */ + struct ifmedia_entry *ifm_cur; /* currently selected media */ + LIST_HEAD(, ifmedia_entry) ifm_list; /* list of all supported media */ + ifm_change_cb_t ifm_change; /* media change driver callback */ + ifm_stat_cb_t ifm_status; /* media status driver callback */ +}; + +/* Initialize an interface's struct if_media field. */ +void ifmedia_init __P((struct ifmedia *ifm, int dontcare_mask, + ifm_change_cb_t change_callback, ifm_stat_cb_t status_callback)); + +/* Add one supported medium to a struct ifmedia. */ +void ifmedia_add __P((struct ifmedia *ifm, int mword, int data, void *aux)); + +/* Add an array (of ifmedia_entry) media to a struct ifmedia. */ +void ifmedia_list_add(struct ifmedia *mp, struct ifmedia_entry *lp, + int count); + +/* Set default media type on initialization. */ +void ifmedia_set __P((struct ifmedia *ifm, int mword)); + +/* Common ioctl function for getting/setting media, called by driver. */ +int ifmedia_ioctl __P((struct ifnet *ifp, struct ifreq *ifr, + struct ifmedia *ifm, u_long cmd)); + +#endif /*_KERNEL */ + +/* + * if_media Options word: + * Bits Use + * ---- ------- + * 0-3 Media variant + * 4 RFU + * 5-7 Media type + * 8-15 Type specific options + * 16-19 RFU + * 20-27 Shared (global) options + * 28-31 Instance + */ + +/* + * Ethernet + */ +#define IFM_ETHER 0x00000020 +#define IFM_10_T 3 /* 10BaseT - RJ45 */ +#define IFM_10_2 4 /* 10Base2 - Thinnet */ +#define IFM_10_5 5 /* 10Base5 - AUI */ +#define IFM_100_TX 6 /* 100BaseTX - RJ45 */ +#define IFM_100_FX 7 /* 100BaseFX - Fiber */ +#define IFM_100_T4 8 /* 100BaseT4 - 4 pair cat 3 */ +#define IFM_100_VG 9 /* 100VG-AnyLAN */ +#define IFM_100_T2 10 /* 100BaseT2 */ +#define IFM_1000_FX 11 /* 1000BaseFX - gigabit over fiber */ +#define IFM_10_STP 12 /* 10BaseT over shielded TP */ +#define IFM_10_FL 13 /* 10BaseFL - Fiber */ + +/* + * Token ring + */ +#define IFM_TOKEN 0x00000040 +#define IFM_TOK_STP4 3 /* Shielded twisted pair 4m - DB9 */ +#define IFM_TOK_STP16 4 /* Shielded twisted pair 16m - DB9 */ +#define IFM_TOK_UTP4 5 /* Unshielded twisted pair 4m - RJ45 */ +#define IFM_TOK_UTP16 6 /* Unshielded twisted pair 16m - RJ45 */ +#define IFM_TOK_ETR 0x00000200 /* Early token release */ +#define IFM_TOK_SRCRT 0x00000400 /* Enable source routing features */ +#define IFM_TOK_ALLR 0x00000800 /* All routes / Single route bcast */ + +/* + * FDDI + */ +#define IFM_FDDI 0x00000060 +#define IFM_FDDI_SMF 3 /* Single-mode fiber */ +#define IFM_FDDI_MMF 4 /* Multi-mode fiber */ +#define IFM_FDDI_UTP 5 /* CDDI / UTP */ +#define IFM_FDDI_DA 0x00000100 /* Dual attach / single attach */ + +/* + * Shared media sub-types + */ +#define IFM_AUTO 0 /* Autoselect best media */ +#define IFM_MANUAL 1 /* Jumper/dipswitch selects media */ +#define IFM_NONE 2 /* Deselect all media */ + +/* + * Shared options + */ +#define IFM_FDX 0x00100000 /* Force full duplex */ +#define IFM_HDX 0x00200000 /* Force half duplex */ +#define IFM_FLAG0 0x01000000 /* Driver defined flag */ +#define IFM_FLAG1 0x02000000 /* Driver defined flag */ +#define IFM_FLAG2 0x04000000 /* Driver defined flag */ +#define IFM_LOOP 0x08000000 /* Put hardware in loopback */ + +/* + * Masks + */ +#define IFM_NMASK 0x000000e0 /* Network type */ +#define IFM_TMASK 0x0000000f /* Media sub-type */ +#define IFM_IMASK 0xf0000000 /* Instance */ +#define IFM_ISHIFT 28 /* Instance shift */ +#define IFM_OMASK 0x0000ff00 /* Type specific options */ +#define IFM_GMASK 0x0ff00000 /* Global options */ + +#define IFM_NMIN IFM_ETHER /* lowest Network type */ +#define IFM_NMAX IFM_NMASK /* highest Network type */ + +/* + * Status bits + */ +#define IFM_AVALID 0x00000001 /* Active bit valid */ +#define IFM_ACTIVE 0x00000002 /* Interface attached to working net */ + +/* + * Macros to extract various bits of information from the media word. + */ +#define IFM_TYPE(x) ((x) & IFM_NMASK) +#define IFM_SUBTYPE(x) ((x) & IFM_TMASK) +#define IFM_INST(x) (((x) & IFM_IMASK) >> IFM_ISHIFT) +#define IFM_OPTIONS(x) ((x) & (IFM_OMASK|IFM_GMASK)) + +#define IFM_INST_MAX IFM_INST(IFM_IMASK) + +/* + * Macro to create a media word. + */ +#define IFM_MAKEWORD(type, subtype, options, instance) \ + ((type) | (subtype) | (options) | ((instance) << IFM_ISHIFT)) + +/* + * NetBSD extension not defined in the BSDI API. This is used in various + * places to get the canonical description for a given type/subtype. + * + * In the subtype and mediaopt descriptions, the valid TYPE bits are OR'd + * in to indicate which TYPE the subtype/option corresponds to. If no + * TYPE is present, it is a shared media/mediaopt. + * + * Note that these are parsed case-insensitive. + * + * Order is important. The first matching entry is the canonical name + * for a media type; subsequent matches are aliases. + */ +struct ifmedia_description { + int ifmt_word; /* word value; may be masked */ + const char *ifmt_string; /* description */ +}; + +#define IFM_TYPE_DESCRIPTIONS { \ + { IFM_ETHER, "Ethernet" }, \ + { IFM_ETHER, "ether" }, \ + { IFM_TOKEN, "TokenRing" }, \ + { IFM_TOKEN, "token" }, \ + { IFM_FDDI, "FDDI" }, \ + { 0, NULL }, \ +} + +#define IFM_TYPE_MATCH(dt, t) \ + (IFM_TYPE((dt)) == 0 || IFM_TYPE((dt)) == IFM_TYPE((t))) + +#define IFM_SUBTYPE_DESCRIPTIONS { \ + { IFM_AUTO, "autoselect" }, \ + { IFM_AUTO, "auto" }, \ + { IFM_MANUAL, "manual" }, \ + { IFM_NONE, "none" }, \ + \ + { IFM_ETHER|IFM_10_T, "10baseT" }, \ + { IFM_ETHER|IFM_10_T, "10baseT/UTP" }, \ + { IFM_ETHER|IFM_10_T, "UTP" }, \ + { IFM_ETHER|IFM_10_T, "10UTP" }, \ + { IFM_ETHER|IFM_10_2, "10base2" }, \ + { IFM_ETHER|IFM_10_2, "10base2/BNC" }, \ + { IFM_ETHER|IFM_10_2, "BNC" }, \ + { IFM_ETHER|IFM_10_2, "10BNC" }, \ + { IFM_ETHER|IFM_10_5, "10base5" }, \ + { IFM_ETHER|IFM_10_5, "10base5/AUI" }, \ + { IFM_ETHER|IFM_10_5, "AUI" }, \ + { IFM_ETHER|IFM_10_5, "10AUI" }, \ + { IFM_ETHER|IFM_100_TX, "100baseTX" }, \ + { IFM_ETHER|IFM_100_TX, "100TX" }, \ + { IFM_ETHER|IFM_100_FX, "100baseFX" }, \ + { IFM_ETHER|IFM_100_FX, "100FX" }, \ + { IFM_ETHER|IFM_100_T4, "100baseT4" }, \ + { IFM_ETHER|IFM_100_T4, "100T4" }, \ + { IFM_ETHER|IFM_100_VG, "100baseVG" }, \ + { IFM_ETHER|IFM_100_VG, "100VG" }, \ + { IFM_ETHER|IFM_100_T2, "100baseT2" }, \ + { IFM_ETHER|IFM_100_T2, "100T2" }, \ + { IFM_ETHER|IFM_1000_FX, "1000baseFX" }, \ + { IFM_ETHER|IFM_1000_FX, "1000FX" }, \ + { IFM_ETHER|IFM_10_STP, "10baseSTP" }, \ + { IFM_ETHER|IFM_10_STP, "STP" }, \ + { IFM_ETHER|IFM_10_STP, "10STP" }, \ + { IFM_ETHER|IFM_10_FL, "10baseFL" }, \ + { IFM_ETHER|IFM_10_FL, "FL" }, \ + { IFM_ETHER|IFM_10_FL, "10FL" }, \ + \ + { IFM_TOKEN|IFM_TOK_STP4, "DB9/4Mbit" }, \ + { IFM_TOKEN|IFM_TOK_STP4, "4STP" }, \ + { IFM_TOKEN|IFM_TOK_STP16, "DB9/16Mbit" }, \ + { IFM_TOKEN|IFM_TOK_STP16, "16STP" }, \ + { IFM_TOKEN|IFM_TOK_UTP4, "UTP/4Mbit" }, \ + { IFM_TOKEN|IFM_TOK_UTP4, "4UTP" }, \ + { IFM_TOKEN|IFM_TOK_UTP16, "UTP/16Mbit" }, \ + { IFM_TOKEN|IFM_TOK_UTP16, "16UTP" }, \ + \ + { IFM_FDDI|IFM_FDDI_SMF, "Single-mode" }, \ + { IFM_FDDI|IFM_FDDI_SMF, "SMF" }, \ + { IFM_FDDI|IFM_FDDI_MMF, "Multi-mode" }, \ + { IFM_FDDI|IFM_FDDI_MMF, "MMF" }, \ + { IFM_FDDI|IFM_FDDI_UTP, "UTP" }, \ + { IFM_FDDI|IFM_FDDI_UTP, "CDDI" }, \ + \ + { 0, NULL }, \ +} + +#define IFM_OPTION_DESCRIPTIONS { \ + { IFM_FDX, "full-duplex" }, \ + { IFM_FDX, "fdx" }, \ + { IFM_HDX, "half-duplex" }, \ + { IFM_HDX, "hdx" }, \ + { IFM_FLAG0, "flag0" }, \ + { IFM_FLAG1, "flag1" }, \ + { IFM_FLAG2, "flag2" }, \ + { IFM_LOOP, "loopback" }, \ + { IFM_LOOP, "hw-loopback"}, \ + { IFM_LOOP, "loop" }, \ + \ + { IFM_TOKEN|IFM_TOK_ETR, "EarlyTokenRelease" }, \ + { IFM_TOKEN|IFM_TOK_ETR, "ETR" }, \ + { IFM_TOKEN|IFM_TOK_SRCRT, "SourceRouting" }, \ + { IFM_TOKEN|IFM_TOK_SRCRT, "SRCRT" }, \ + { IFM_TOKEN|IFM_TOK_ALLR, "AllRoutes" }, \ + { IFM_TOKEN|IFM_TOK_ALLR, "ALLR" }, \ + \ + { IFM_FDDI|IFM_FDDI_DA, "dual-attach" }, \ + { IFM_FDDI|IFM_FDDI_DA, "das" }, \ + \ + { 0, NULL }, \ +} + +#endif /* _NET_IF_MEDIA_H_ */ |