freebsd_network: Changes for FreeBSD 12 net80211.

This commit is contained in:
Augustin Cavalier 2019-01-07 17:27:08 -05:00
parent 3d4f7f0f60
commit f733714a6a
6 changed files with 443 additions and 186 deletions

View File

@ -60,7 +60,8 @@
#define IFF_LINK2 0x00100000 /* per link layer defined bit */
#define IFF_DEBUG 0x00200000
#define IFF_MONITOR 0x00400000 /* (n) user-requested monitor mode */
#define IFF_NOGROUP 0x00800000 /* (n) interface is not part of any groups */
#define IFF_PPROMISC 0x00800000 /* (n) user-requested promisc mode */
#define IFF_NOGROUP 0x01000000 /* (n) interface is not part of any groups */
#define LINK_STATE_UNKNOWN 0
#define LINK_STATE_DOWN 1

View File

@ -1,7 +1,9 @@
/* $NetBSD: if_media.h,v 1.3 1997/03/26 01:19:27 thorpej Exp $ */
/* $FreeBSD: src/sys/net/if_media.h,v 1.43 2008/08/01 22:13:39 antoine Exp $ */
/* $FreeBSD: head/sys/net/if_media.h 338208 2018-08-22 18:19:56Z erj $ */
/*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 1997
* Jonathan Stone and Jason R. Thorpe. All rights reserved.
*
@ -36,7 +38,7 @@
*/
#ifndef _FBSD_COMPAT_NET_IF_MEDIA_H_
#define _FBSD_COMPAT_NET_IF_MEDIA_H_
#define _FBSD_COMPAT_NET_IF_MEDIA_H_
/*
* Prototypes and definitions for BSD/OS-compatible network interface
@ -54,11 +56,13 @@
#include <sys/queue.h>
struct ifnet;
/*
* Driver callbacks for media status and change requests.
*/
typedef int (*ifm_change_cb_t)(struct ifnet *ifp);
typedef void (*ifm_stat_cb_t)(struct ifnet *ifp, struct ifmediareq *req);
typedef int (*ifm_change_cb_t)(struct ifnet *);
typedef void (*ifm_stat_cb_t)(struct ifnet *, struct ifmediareq *req);
/*
* In-kernel representation of a single supported media type.
@ -104,6 +108,7 @@ void ifmedia_set(struct ifmedia *ifm, int mword);
int ifmedia_ioctl(struct ifnet *ifp, struct ifreq *ifr,
struct ifmedia *ifm, u_long cmd);
/* Compute baudrate for a given media. */
uint64_t ifmedia_baudrate(int);
@ -115,7 +120,7 @@ uint64_t ifmedia_baudrate(int);
* ---- -------
* 0-4 Media variant
* 5-7 Media type
* 8-15 Type specific options
* 8-15 Type specific options (includes added variant bits on Ethernet)
* 16-18 Mode (for multi-mode devices)
* 19 RFU
* 20-27 Shared (global) options
@ -124,8 +129,18 @@ uint64_t ifmedia_baudrate(int);
/*
* Ethernet
* In order to use more than 31 subtypes, Ethernet uses some of the option
* bits as part of the subtype field. See the options section below for
* relevant definitions
*/
#define IFM_ETHER 0x00000020
#define IFM_ETHER_SUBTYPE(x) (((x) & IFM_TMASK) | \
(((x) & (IFM_ETH_XTYPE >> IFM_ETH_XSHIFT)) << IFM_ETH_XSHIFT))
#define IFM_X(x) IFM_ETHER_SUBTYPE(x) /* internal shorthand */
#define IFM_ETHER_SUBTYPE_SET(x) (IFM_ETHER_SUBTYPE(x) | IFM_ETHER)
#define IFM_ETHER_SUBTYPE_GET(x) ((x) & (IFM_TMASK|IFM_ETH_XTYPE))
#define IFM_ETHER_IS_EXTENDED(x) ((x) & IFM_ETH_XTYPE)
#define IFM_10_T 3 /* 10BaseT - RJ45 */
#define IFM_10_2 4 /* 10Base2 - Thinnet */
#define IFM_10_5 5 /* 10Base5 - AUI */
@ -144,41 +159,118 @@ uint64_t ifmedia_baudrate(int);
#define IFM_10G_LR 18 /* 10GBase-LR 1310nm Single-mode */
#define IFM_10G_SR 19 /* 10GBase-SR 850nm Multi-mode */
#define IFM_10G_CX4 20 /* 10GBase CX4 copper */
#define IFM_2500_SX 21 /* 2500BaseSX - multi-mode fiber */
#define IFM_2500_SX 21 /* 2500BaseSX - multi-mode fiber */
#define IFM_10G_TWINAX 22 /* 10GBase Twinax copper */
#define IFM_10G_TWINAX_LONG 23 /* 10GBase Twinax Long copper */
#define IFM_10G_LRM 24 /* 10GBase-LRM 850nm Multi-mode */
#define IFM_UNKNOWN 25 /* media types not defined yet */
#define IFM_10G_T 26 /* 10GBase-T - RJ45 */
#define IFM_40G_CR4 27 /* 40GBase-CR4 */
#define IFM_40G_SR4 28 /* 40GBase-SR4 */
#define IFM_40G_LR4 29 /* 40GBase-LR4 */
#define IFM_1000_KX 30 /* 1000Base-KX backplane */
#define IFM_OTHER 31 /* Other: one of the following */
/* following types are not visible to old binaries using only IFM_TMASK */
#define IFM_10G_KX4 IFM_X(32) /* 10GBase-KX4 backplane */
#define IFM_10G_KR IFM_X(33) /* 10GBase-KR backplane */
#define IFM_10G_CR1 IFM_X(34) /* 10GBase-CR1 Twinax splitter */
#define IFM_20G_KR2 IFM_X(35) /* 20GBase-KR2 backplane */
#define IFM_2500_KX IFM_X(36) /* 2500Base-KX backplane */
#define IFM_2500_T IFM_X(37) /* 2500Base-T - RJ45 (NBaseT) */
#define IFM_5000_T IFM_X(38) /* 5000Base-T - RJ45 (NBaseT) */
#define IFM_50G_PCIE IFM_X(39) /* 50G Ethernet over PCIE */
#define IFM_25G_PCIE IFM_X(40) /* 25G Ethernet over PCIE */
#define IFM_1000_SGMII IFM_X(41) /* 1G media interface */
#define IFM_10G_SFI IFM_X(42) /* 10G media interface */
#define IFM_40G_XLPPI IFM_X(43) /* 40G media interface */
#define IFM_1000_CX_SGMII IFM_X(44) /* 1000Base-CX-SGMII */
#define IFM_40G_KR4 IFM_X(45) /* 40GBase-KR4 */
#define IFM_10G_ER IFM_X(46) /* 10GBase-ER */
#define IFM_100G_CR4 IFM_X(47) /* 100GBase-CR4 */
#define IFM_100G_SR4 IFM_X(48) /* 100GBase-SR4 */
#define IFM_100G_KR4 IFM_X(49) /* 100GBase-KR4 */
#define IFM_100G_LR4 IFM_X(50) /* 100GBase-LR4 */
#define IFM_56G_R4 IFM_X(51) /* 56GBase-R4 */
#define IFM_100_T IFM_X(52) /* 100BaseT - RJ45 */
#define IFM_25G_CR IFM_X(53) /* 25GBase-CR */
#define IFM_25G_KR IFM_X(54) /* 25GBase-KR */
#define IFM_25G_SR IFM_X(55) /* 25GBase-SR */
#define IFM_50G_CR2 IFM_X(56) /* 50GBase-CR2 */
#define IFM_50G_KR2 IFM_X(57) /* 50GBase-KR2 */
#define IFM_25G_LR IFM_X(58) /* 25GBase-LR */
#define IFM_10G_AOC IFM_X(59) /* 10G active optical cable */
#define IFM_25G_ACC IFM_X(60) /* 25G active copper cable */
#define IFM_25G_AOC IFM_X(61) /* 25G active optical cable */
#define IFM_100_SGMII IFM_X(62) /* 100M media interface */
#define IFM_2500_X IFM_X(63) /* 2500BaseX */
#define IFM_5000_KR IFM_X(64) /* 5GBase-KR backplane */
#define IFM_25G_T IFM_X(65) /* 25GBase-T - RJ45 */
#define IFM_25G_CR_S IFM_X(66) /* 25GBase-CR (short) */
#define IFM_25G_CR1 IFM_X(67) /* 25GBase-CR1 DA cable */
#define IFM_25G_KR_S IFM_X(68) /* 25GBase-KR (short) */
#define IFM_5000_KR_S IFM_X(69) /* 5GBase-KR backplane (short) */
#define IFM_5000_KR1 IFM_X(70) /* 5GBase-KR backplane */
#define IFM_25G_AUI IFM_X(71) /* 25G-AUI-C2C (chip to chip) */
#define IFM_40G_XLAUI IFM_X(72) /* 40G-XLAUI */
#define IFM_40G_XLAUI_AC IFM_X(73) /* 40G active copper/optical */
#define IFM_40G_ER4 IFM_X(74) /* 40GBase-ER4 */
#define IFM_50G_SR2 IFM_X(75) /* 50GBase-SR2 */
#define IFM_50G_LR2 IFM_X(76) /* 50GBase-LR2 */
#define IFM_50G_LAUI2_AC IFM_X(77) /* 50G active copper/optical */
#define IFM_50G_LAUI2 IFM_X(78) /* 50G-LAUI2 */
#define IFM_50G_AUI2_AC IFM_X(79) /* 50G active copper/optical */
#define IFM_50G_AUI2 IFM_X(80) /* 50G-AUI2 */
#define IFM_50G_CP IFM_X(81) /* 50GBase-CP */
#define IFM_50G_SR IFM_X(82) /* 50GBase-SR */
#define IFM_50G_LR IFM_X(83) /* 50GBase-LR */
#define IFM_50G_FR IFM_X(84) /* 50GBase-FR */
#define IFM_50G_KR_PAM4 IFM_X(85) /* 50GBase-KR PAM4 */
#define IFM_25G_KR1 IFM_X(86) /* 25GBase-KR1 */
#define IFM_50G_AUI1_AC IFM_X(87) /* 50G active copper/optical */
#define IFM_50G_AUI1 IFM_X(88) /* 50G-AUI1 */
#define IFM_100G_CAUI4_AC IFM_X(89) /* 100G-CAUI4 active copper/optical */
#define IFM_100G_CAUI4 IFM_X(90) /* 100G-CAUI4 */
#define IFM_100G_AUI4_AC IFM_X(91) /* 100G-AUI4 active copper/optical */
#define IFM_100G_AUI4 IFM_X(92) /* 100G-AUI4 */
#define IFM_100G_CR_PAM4 IFM_X(93) /* 100GBase-CR PAM4 */
#define IFM_100G_KR_PAM4 IFM_X(94) /* 100GBase-CR PAM4 */
#define IFM_100G_CP2 IFM_X(95) /* 100GBase-CP2 */
#define IFM_100G_SR2 IFM_X(96) /* 100GBase-SR2 */
#define IFM_100G_DR IFM_X(97) /* 100GBase-DR */
#define IFM_100G_KR2_PAM4 IFM_X(98) /* 100GBase-KR2 PAM4 */
#define IFM_100G_CAUI2_AC IFM_X(99) /* 100G-CAUI2 active copper/optical */
#define IFM_100G_CAUI2 IFM_X(100) /* 100G-CAUI2 */
#define IFM_100G_AUI2_AC IFM_X(101) /* 100G-AUI2 active copper/optical */
#define IFM_100G_AUI2 IFM_X(102) /* 100G-AUI2 */
#define IFM_200G_CR4_PAM4 IFM_X(103) /* 200GBase-CR4 PAM4 */
#define IFM_200G_SR4 IFM_X(104) /* 200GBase-SR4 */
#define IFM_200G_FR4 IFM_X(105) /* 200GBase-FR4 */
#define IFM_200G_LR4 IFM_X(106) /* 200GBase-LR4 */
#define IFM_200G_DR4 IFM_X(107) /* 200GBase-DR4 */
#define IFM_200G_KR4_PAM4 IFM_X(108) /* 200GBase-KR4 PAM4 */
#define IFM_200G_AUI4_AC IFM_X(109) /* 200G-AUI4 active copper/optical */
#define IFM_200G_AUI4 IFM_X(110) /* 200G-AUI4 */
#define IFM_200G_AUI8_AC IFM_X(111) /* 200G-AUI8 active copper/optical */
#define IFM_200G_AUI8 IFM_X(112) /* 200G-AUI8 */
#define IFM_400G_FR8 IFM_X(113) /* 400GBase-FR8 */
#define IFM_400G_LR8 IFM_X(114) /* 400GBase-LR8 */
#define IFM_400G_DR4 IFM_X(115) /* 400GBase-DR4 */
#define IFM_400G_AUI8_AC IFM_X(116) /* 400G-AUI8 active copper/optical */
#define IFM_400G_AUI8 IFM_X(117) /* 400G-AUI8 */
/* note 31 is the max! */
/*
* Please update ieee8023ad_lacp.c:lacp_compose_key()
* after adding new Ethernet media types.
*/
/* Note IFM_X(511) is the max! */
/* Ethernet option values; includes bits used for extended variant field */
#define IFM_ETH_MASTER 0x00000100 /* master mode (1000baseT) */
#define IFM_ETH_RXPAUSE 0x00000200 /* receive PAUSE frames */
#define IFM_ETH_TXPAUSE 0x00000400 /* transmit PAUSE frames */
/*
* 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_STP100 7 /* Shielded twisted pair 100m - DB9 */
#define IFM_TOK_UTP100 8 /* Unshielded twisted pair 100m - 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 */
#define IFM_TOK_DTR 0x00002000 /* Dedicated token ring */
#define IFM_TOK_CLASSIC 0x00004000 /* Classic token ring */
#define IFM_TOK_AUTO 0x00008000 /* Automatic Dedicate/Classic token ring */
/*
* 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 */
#define IFM_ETH_RXPAUSE 0x00000200 /* receive PAUSE frames */
#define IFM_ETH_TXPAUSE 0x00000400 /* transmit PAUSE frames */
#define IFM_ETH_XTYPE 0x00007800 /* extended media variants */
#define IFM_ETH_XSHIFT 6 /* shift XTYPE next to TMASK */
/*
* IEEE 802.11 Wireless
@ -208,6 +300,7 @@ uint64_t ifmedia_baudrate(int);
#define IFM_IEEE80211_OFDM27 23 /* OFDM 27Mbps */
/* NB: not enough bits to express MCS fully */
#define IFM_IEEE80211_MCS 24 /* HT MCS rate */
#define IFM_IEEE80211_VHT 25 /* VHT MCS rate */
#define IFM_IEEE80211_ADHOC 0x00000100 /* Operate in Adhoc mode */
#define IFM_IEEE80211_HOSTAP 0x00000200 /* Operate in Host AP mode */
@ -224,29 +317,26 @@ uint64_t ifmedia_baudrate(int);
#define IFM_IEEE80211_FH 0x00040000 /* 2Ghz, GFSK mode */
#define IFM_IEEE80211_11NA 0x00050000 /* 5Ghz, HT mode */
#define IFM_IEEE80211_11NG 0x00060000 /* 2Ghz, HT mode */
#define IFM_IEEE80211_VHT5G 0x00070000 /* 5Ghz, VHT mode */
#define IFM_IEEE80211_VHT2G 0x00080000 /* 2Ghz, VHT mode */
/*
* ATM
*/
#define IFM_ATM 0x000000a0
#define IFM_ATM_UNKNOWN 3
#define IFM_ATM_UTP_25 4
#define IFM_ATM_TAXI_100 5
#define IFM_ATM_TAXI_140 6
#define IFM_ATM_MM_155 7
#define IFM_ATM_SM_155 8
#define IFM_ATM_UTP_155 9
#define IFM_ATM_MM_622 10
#define IFM_ATM_SM_622 11
#define IFM_ATM 0x000000a0
#define IFM_ATM_UNKNOWN 3
#define IFM_ATM_UTP_25 4
#define IFM_ATM_TAXI_100 5
#define IFM_ATM_TAXI_140 6
#define IFM_ATM_MM_155 7
#define IFM_ATM_SM_155 8
#define IFM_ATM_UTP_155 9
#define IFM_ATM_MM_622 10
#define IFM_ATM_SM_622 11
#define IFM_ATM_VIRTUAL 12
#define IFM_ATM_SDH 0x00000100 /* SDH instead of SONET */
#define IFM_ATM_NOSCRAMB 0x00000200 /* no scrambling */
#define IFM_ATM_UNASSIGNED 0x00000400 /* unassigned cells */
/*
* CARP Common Address Redundancy Protocol
*/
#define IFM_CARP 0x000000c0
#define IFM_ATM_SDH 0x00000100 /* SDH instead of SONET */
#define IFM_ATM_NOSCRAMB 0x00000200 /* no scrambling */
#define IFM_ATM_UNASSIGNED 0x00000400 /* unassigned cells */
/*
* Shared media sub-types
@ -260,7 +350,7 @@ uint64_t ifmedia_baudrate(int);
*/
#define IFM_FDX 0x00100000 /* Force full duplex */
#define IFM_HDX 0x00200000 /* Force half duplex */
#define IFM_FLOW 0x00400000 /* Enable hardware flow control */
#define IFM_FLOW 0x00400000 /* enable hardware flow control */
#define IFM_FLAG0 0x01000000 /* Driver defined flag */
#define IFM_FLAG1 0x02000000 /* Driver defined flag */
#define IFM_FLAG2 0x04000000 /* Driver defined flag */
@ -278,32 +368,43 @@ uint64_t ifmedia_baudrate(int);
#define IFM_MSHIFT 16 /* Mode shift */
#define IFM_GMASK 0x0ff00000 /* Global options */
/* Ethernet flow control mask */
#define IFM_ETH_FMASK (IFM_FLOW | IFM_ETH_RXPAUSE | IFM_ETH_TXPAUSE)
/*
* Status bits
*/
#define IFM_AVALID 0x10000000 /* Active bit valid */
#define IFM_ACTIVE 0x00800000 /* same as Haiku's */
#ifndef __HAIKU__
#define IFM_AVALID 0x00000001 /* Active bit valid */
#define IFM_ACTIVE 0x00000002 /* Interface attached to working net */
#else
#define IFM_AVALID 0x10000000 /* Active bit valid */
#define IFM_ACTIVE 0x00800000 /* same as Haiku's */
#endif
/* Mask of "status valid" bits, for ifconfig(8). */
#define IFM_STATUS_VALID IFM_AVALID
/* List of "status valid" bits, for ifconfig(8). */
#define IFM_STATUS_VALID_LIST { \
IFM_AVALID, \
0 \
#define IFM_STATUS_VALID_LIST { \
IFM_AVALID, \
0 \
}
/*
* 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_TYPE_OPTIONS(x) ((x) & IFM_OMASK)
#define IFM_INST(x) (((x) & IFM_IMASK) >> IFM_ISHIFT)
#define IFM_OPTIONS(x) ((x) & (IFM_OMASK|IFM_GMASK))
#define IFM_MODE(x) ((x) & IFM_MMASK)
#define IFM_TYPE(x) ((x) & IFM_NMASK)
#define IFM_SUBTYPE(x) \
(IFM_TYPE(x) == IFM_ETHER ? IFM_ETHER_SUBTYPE_GET(x) : ((x) & IFM_TMASK))
#define IFM_TYPE_MATCH(x,y) \
(IFM_TYPE(x) == IFM_TYPE(y) && IFM_SUBTYPE(x) == IFM_SUBTYPE(y))
#define IFM_TYPE_OPTIONS(x) ((x) & IFM_OMASK)
#define IFM_INST(x) (((x) & IFM_IMASK) >> IFM_ISHIFT)
#define IFM_OPTIONS(x) ((x) & (IFM_OMASK | IFM_GMASK))
#define IFM_MODE(x) ((x) & IFM_MMASK)
#define IFM_INST_MAX IFM_INST(IFM_IMASK)
#define IFM_INST_MAX IFM_INST(IFM_IMASK)
/*
* Macro to create a media word.
@ -327,11 +428,8 @@ struct ifmedia_description {
#define IFM_TYPE_DESCRIPTIONS { \
{ IFM_ETHER, "Ethernet" }, \
{ IFM_TOKEN, "Token ring" }, \
{ IFM_FDDI, "FDDI" }, \
{ IFM_IEEE80211, "IEEE 802.11 Wireless Ethernet" }, \
{ IFM_ATM, "ATM" }, \
{ IFM_CARP, "Common Address Redundancy Protocol" }, \
{ 0, NULL }, \
}
@ -354,12 +452,108 @@ struct ifmedia_description {
{ IFM_10G_LR, "10Gbase-LR" }, \
{ IFM_10G_SR, "10Gbase-SR" }, \
{ IFM_10G_CX4, "10Gbase-CX4" }, \
{ IFM_UNKNOWN, "Unknown" }, \
{ IFM_2500_SX, "2500BaseSX" }, \
{ IFM_10G_LRM, "10Gbase-LRM" }, \
{ IFM_10G_TWINAX, "10Gbase-Twinax" }, \
{ IFM_10G_TWINAX_LONG, "10Gbase-Twinax-Long" }, \
{ IFM_UNKNOWN, "Unknown" }, \
{ IFM_10G_T, "10Gbase-T" }, \
{ IFM_40G_CR4, "40Gbase-CR4" }, \
{ IFM_40G_SR4, "40Gbase-SR4" }, \
{ IFM_40G_LR4, "40Gbase-LR4" }, \
{ IFM_1000_KX, "1000Base-KX" }, \
{ IFM_OTHER, "Other" }, \
{ IFM_10G_KX4, "10GBase-KX4" }, \
{ IFM_10G_KR, "10GBase-KR" }, \
{ IFM_10G_CR1, "10GBase-CR1" }, \
{ IFM_20G_KR2, "20GBase-KR2" }, \
{ IFM_2500_KX, "2500Base-KX" }, \
{ IFM_2500_T, "2500Base-T" }, \
{ IFM_5000_T, "5000Base-T" }, \
{ IFM_50G_PCIE, "PCIExpress-50G" }, \
{ IFM_25G_PCIE, "PCIExpress-25G" }, \
{ IFM_1000_SGMII, "1000Base-SGMII" }, \
{ IFM_10G_SFI, "10GBase-SFI" }, \
{ IFM_40G_XLPPI, "40GBase-XLPPI" }, \
{ IFM_1000_CX_SGMII, "1000Base-CX-SGMII" }, \
{ IFM_40G_KR4, "40GBase-KR4" }, \
{ IFM_10G_ER, "10GBase-ER" }, \
{ IFM_100G_CR4, "100GBase-CR4" }, \
{ IFM_100G_SR4, "100GBase-SR4" }, \
{ IFM_100G_KR4, "100GBase-KR4" }, \
{ IFM_100G_LR4, "100GBase-LR4" }, \
{ IFM_56G_R4, "56GBase-R4" }, \
{ IFM_100_T, "100BaseT" }, \
{ IFM_25G_CR, "25GBase-CR" }, \
{ IFM_25G_KR, "25GBase-KR" }, \
{ IFM_25G_SR, "25GBase-SR" }, \
{ IFM_50G_CR2, "50GBase-CR2" }, \
{ IFM_50G_KR2, "50GBase-KR2" }, \
{ IFM_25G_LR, "25GBase-LR" }, \
{ IFM_10G_AOC, "10GBase-AOC" }, \
{ IFM_25G_ACC, "25GBase-ACC" }, \
{ IFM_25G_AOC, "25GBase-AOC" }, \
{ IFM_100_SGMII, "100M-SGMII" }, \
{ IFM_2500_X, "2500Base-X" }, \
{ IFM_5000_KR, "5000Base-KR" }, \
{ IFM_25G_T, "25GBase-T" }, \
{ IFM_25G_CR_S, "25GBase-CR-S" }, \
{ IFM_25G_CR1, "25GBase-CR1" }, \
{ IFM_25G_KR_S, "25GBase-KR-S" }, \
{ IFM_5000_KR_S, "5000Base-KR-S" }, \
{ IFM_5000_KR1, "5000Base-KR1" }, \
{ IFM_25G_AUI, "25G-AUI" }, \
{ IFM_40G_XLAUI, "40G-XLAUI" }, \
{ IFM_40G_XLAUI_AC, "40G-XLAUI-AC" }, \
{ IFM_40G_ER4, "40GBase-ER4" }, \
{ IFM_50G_SR2, "50GBase-SR2" }, \
{ IFM_50G_LR2, "50GBase-LR2" }, \
{ IFM_50G_LAUI2_AC, "50G-LAUI2-AC" }, \
{ IFM_50G_LAUI2, "50G-LAUI2" }, \
{ IFM_50G_AUI2_AC, "50G-AUI2-AC" }, \
{ IFM_50G_AUI2, "50G-AUI2" }, \
{ IFM_50G_CP, "50GBase-CP" }, \
{ IFM_50G_SR, "50GBase-SR" }, \
{ IFM_50G_LR, "50GBase-LR" }, \
{ IFM_50G_FR, "50GBase-FR" }, \
{ IFM_50G_KR_PAM4, "50GBase-KR-PAM4" }, \
{ IFM_25G_KR1, "25GBase-KR1" }, \
{ IFM_50G_AUI1_AC, "50G-AUI1-AC" }, \
{ IFM_50G_AUI1, "50G-AUI1" }, \
{ IFM_100G_CAUI4_AC, "100G-CAUI4-AC" }, \
{ IFM_100G_CAUI4, "100G-CAUI4" }, \
{ IFM_100G_AUI4_AC, "100G-AUI4-AC" }, \
{ IFM_100G_AUI4, "100G-AUI4" }, \
{ IFM_100G_CR_PAM4, "100GBase-CR-PAM4" }, \
{ IFM_100G_KR_PAM4, "100GBase-KR-PAM4" }, \
{ IFM_100G_CP2, "100GBase-CP2" }, \
{ IFM_100G_SR2, "100GBase-SR2" }, \
{ IFM_100G_DR, "100GBase-DR" }, \
{ IFM_100G_KR2_PAM4, "100GBase-KR2-PAM4" }, \
{ IFM_100G_CAUI2_AC, "100G-CAUI2-AC" }, \
{ IFM_100G_CAUI2, "100G-CAUI2" }, \
{ IFM_100G_AUI2_AC, "100G-AUI2-AC" }, \
{ IFM_100G_AUI2, "100G-AUI2" }, \
{ IFM_200G_CR4_PAM4, "200GBase-CR4-PAM4" }, \
{ IFM_200G_SR4, "200GBase-SR4" }, \
{ IFM_200G_FR4, "200GBase-FR4" }, \
{ IFM_200G_LR4, "200GBase-LR4" }, \
{ IFM_200G_DR4, "200GBase-DR4" }, \
{ IFM_200G_KR4_PAM4, "200GBase-KR4-PAM4" }, \
{ IFM_200G_AUI4_AC, "200G-AUI4-AC" }, \
{ IFM_200G_AUI4, "200G-AUI4" }, \
{ IFM_200G_AUI8_AC, "200G-AUI8-AC" }, \
{ IFM_200G_AUI8, "200G-AUI8" }, \
{ IFM_400G_FR8, "400GBase-FR8" }, \
{ IFM_400G_LR8, "400GBase-LR8" }, \
{ IFM_400G_DR4, "400GBase-DR4" }, \
{ IFM_400G_AUI8_AC, "400G-AUI8-AC" }, \
{ IFM_400G_AUI8, "400G-AUI8" }, \
{ 0, NULL }, \
}
#define IFM_SUBTYPE_ETHERNET_ALIASES { \
{ IFM_10_T, "10baseT" }, \
{ IFM_10_T, "UTP" }, \
{ IFM_10_T, "10UTP" }, \
{ IFM_10_2, "BNC" }, \
@ -379,59 +573,30 @@ struct ifmedia_description {
{ IFM_1000_T, "1000TX" }, \
{ IFM_1000_T, "1000T" }, \
{ IFM_2500_SX, "2500SX" }, \
\
/* \
* Shorthands for common media+option combinations as announced \
* by miibus(4) \
*/ \
{ IFM_10_T | IFM_FDX, "10baseT-FDX" }, \
{ IFM_10_T | IFM_FDX | IFM_FLOW, "10baseT-FDX-flow" }, \
{ IFM_100_TX | IFM_FDX, "100baseTX-FDX" }, \
{ IFM_100_TX | IFM_FDX | IFM_FLOW, "100baseTX-FDX-flow" }, \
{ IFM_1000_T | IFM_FDX, "1000baseT-FDX" }, \
{ IFM_1000_T | IFM_FDX | IFM_FLOW, "1000baseT-FDX-flow" }, \
{ IFM_1000_T | IFM_FDX | IFM_FLOW | IFM_ETH_MASTER, \
"1000baseT-FDX-flow-master" }, \
{ IFM_1000_T | IFM_FDX | IFM_ETH_MASTER, \
"1000baseT-FDX-master" }, \
{ IFM_1000_T | IFM_ETH_MASTER, "1000baseT-master" }, \
\
{ 0, NULL }, \
}
#define IFM_SUBTYPE_ETHERNET_OPTION_DESCRIPTIONS { \
{ 0, NULL }, \
}
#define IFM_SUBTYPE_TOKENRING_DESCRIPTIONS { \
{ IFM_TOK_STP4, "DB9/4Mbit" }, \
{ IFM_TOK_STP16, "DB9/16Mbit" }, \
{ IFM_TOK_UTP4, "UTP/4Mbit" }, \
{ IFM_TOK_UTP16, "UTP/16Mbit" }, \
{ IFM_TOK_STP100, "STP/100Mbit" }, \
{ IFM_TOK_UTP100, "UTP/100Mbit" }, \
{ 0, NULL }, \
}
#define IFM_SUBTYPE_TOKENRING_ALIASES { \
{ IFM_TOK_STP4, "4STP" }, \
{ IFM_TOK_STP16, "16STP" }, \
{ IFM_TOK_UTP4, "4UTP" }, \
{ IFM_TOK_UTP16, "16UTP" }, \
{ IFM_TOK_STP100, "100STP" }, \
{ IFM_TOK_UTP100, "100UTP" }, \
{ 0, NULL }, \
}
#define IFM_SUBTYPE_TOKENRING_OPTION_DESCRIPTIONS { \
{ IFM_TOK_ETR, "EarlyTokenRelease" }, \
{ IFM_TOK_SRCRT, "SourceRouting" }, \
{ IFM_TOK_ALLR, "AllRoutes" }, \
{ IFM_TOK_DTR, "Dedicated" }, \
{ IFM_TOK_CLASSIC,"Classic" }, \
{ IFM_TOK_AUTO, " " }, \
{ 0, NULL }, \
}
#define IFM_SUBTYPE_FDDI_DESCRIPTIONS { \
{ IFM_FDDI_SMF, "Single-mode" }, \
{ IFM_FDDI_MMF, "Multi-mode" }, \
{ IFM_FDDI_UTP, "UTP" }, \
{ 0, NULL }, \
}
#define IFM_SUBTYPE_FDDI_ALIASES { \
{ IFM_FDDI_SMF, "SMF" }, \
{ IFM_FDDI_MMF, "MMF" }, \
{ IFM_FDDI_UTP, "CDDI" }, \
{ 0, NULL }, \
}
#define IFM_SUBTYPE_FDDI_OPTION_DESCRIPTIONS { \
{ IFM_FDDI_DA, "Dual-attach" }, \
{ IFM_ETH_MASTER, "master" }, \
{ IFM_ETH_RXPAUSE, "rxpause" }, \
{ IFM_ETH_TXPAUSE, "txpause" }, \
{ 0, NULL }, \
}
@ -457,6 +622,8 @@ struct ifmedia_description {
{ IFM_IEEE80211_OFDM3, "OFDM/3Mbps" }, \
{ IFM_IEEE80211_OFDM4, "OFDM/4.5Mbps" }, \
{ IFM_IEEE80211_OFDM27, "OFDM/27Mbps" }, \
{ IFM_IEEE80211_MCS, "MCS" }, \
{ IFM_IEEE80211_VHT, "VHT" }, \
{ 0, NULL }, \
}
@ -495,6 +662,8 @@ struct ifmedia_description {
{ IFM_IEEE80211_OFDM3, "OFDM3" }, \
{ IFM_IEEE80211_OFDM4, "OFDM4.5" }, \
{ IFM_IEEE80211_OFDM27, "OFDM27" }, \
{ IFM_IEEE80211_MCS, "MCS" }, \
{ IFM_IEEE80211_VHT, "VHT" }, \
{ 0, NULL }, \
}
@ -505,6 +674,7 @@ struct ifmedia_description {
{ IFM_IEEE80211_WDS, "wds" }, \
{ IFM_IEEE80211_TURBO, "turbo" }, \
{ IFM_IEEE80211_MONITOR, "monitor" }, \
{ IFM_IEEE80211_MBSS, "mesh" }, \
{ 0, NULL }, \
}
@ -516,6 +686,8 @@ struct ifmedia_description {
{ IFM_IEEE80211_FH, "fh" }, \
{ IFM_IEEE80211_11NA, "11na" }, \
{ IFM_IEEE80211_11NG, "11ng" }, \
{ IFM_IEEE80211_VHT5G, "11ac" }, \
{ IFM_IEEE80211_VHT2G, "11ac2" }, \
{ 0, NULL }, \
}
@ -524,7 +696,7 @@ struct ifmedia_description {
{ 0, NULL }, \
}
# define IFM_SUBTYPE_ATM_DESCRIPTIONS { \
#define IFM_SUBTYPE_ATM_DESCRIPTIONS { \
{ IFM_ATM_UNKNOWN, "Unknown" }, \
{ IFM_ATM_UTP_25, "UTP/25.6MBit" }, \
{ IFM_ATM_TAXI_100, "Taxi/100MBit" }, \
@ -538,7 +710,7 @@ struct ifmedia_description {
{ 0, NULL }, \
}
# define IFM_SUBTYPE_ATM_ALIASES { \
#define IFM_SUBTYPE_ATM_ALIASES { \
{ IFM_ATM_UNKNOWN, "UNKNOWN" }, \
{ IFM_ATM_UTP_25, "UTP-25" }, \
{ IFM_ATM_TAXI_100, "TAXI-100" }, \
@ -559,7 +731,6 @@ struct ifmedia_description {
{ 0, NULL }, \
}
#define IFM_SUBTYPE_SHARED_DESCRIPTIONS { \
{ IFM_AUTO, "autoselect" }, \
{ IFM_MANUAL, "manual" }, \
@ -569,12 +740,20 @@ struct ifmedia_description {
#define IFM_SUBTYPE_SHARED_ALIASES { \
{ IFM_AUTO, "auto" }, \
\
/* \
* Shorthands for common media+option combinations as announced \
* by miibus(4) \
*/ \
{ IFM_AUTO | IFM_FLOW, "auto-flow" }, \
\
{ 0, NULL }, \
}
#define IFM_SHARED_OPTION_DESCRIPTIONS { \
{ IFM_FDX, "full-duplex" }, \
{ IFM_HDX, "half-duplex" }, \
{ IFM_FLOW, "flowcontrol" }, \
{ IFM_FLAG0, "flag0" }, \
{ IFM_FLAG1, "flag1" }, \
{ IFM_FLAG2, "flag2" }, \
@ -582,6 +761,15 @@ struct ifmedia_description {
{ 0, NULL }, \
}
#define IFM_SHARED_OPTION_ALIASES { \
{ IFM_FDX, "fdx" }, \
{ IFM_HDX, "hdx" }, \
{ IFM_FLOW, "flow" }, \
{ IFM_LOOP, "loop" }, \
{ IFM_LOOP, "loopback" }, \
{ 0, NULL }, \
}
/*
* Baudrate descriptions for the various media types.
*/
@ -590,7 +778,7 @@ struct ifmedia_baudrate {
uint64_t ifmb_baudrate; /* corresponding baudrate */
};
#define IFM_BAUDRATE_DESCRIPTIONS { \
#define IFM_BAUDRATE_DESCRIPTIONS { \
{ IFM_ETHER | IFM_10_T, IF_Mbps(10) }, \
{ IFM_ETHER | IFM_10_2, IF_Mbps(10) }, \
{ IFM_ETHER | IFM_10_5, IF_Mbps(10) }, \
@ -610,15 +798,100 @@ struct ifmedia_baudrate {
{ IFM_ETHER | IFM_10G_SR, IF_Gbps(10ULL) }, \
{ IFM_ETHER | IFM_10G_CX4, IF_Gbps(10ULL) }, \
{ IFM_ETHER | IFM_2500_SX, IF_Mbps(2500ULL) }, \
\
{ IFM_TOKEN | IFM_TOK_STP4, IF_Mbps(4) }, \
{ IFM_TOKEN | IFM_TOK_STP16, IF_Mbps(16) }, \
{ IFM_TOKEN | IFM_TOK_UTP4, IF_Mbps(4) }, \
{ IFM_TOKEN | IFM_TOK_UTP16, IF_Mbps(16) }, \
\
{ IFM_FDDI | IFM_FDDI_SMF, IF_Mbps(100) }, \
{ IFM_FDDI | IFM_FDDI_MMF, IF_Mbps(100) }, \
{ IFM_FDDI | IFM_FDDI_UTP, IF_Mbps(100) }, \
{ IFM_ETHER | IFM_10G_TWINAX, IF_Gbps(10ULL) }, \
{ IFM_ETHER | IFM_10G_TWINAX_LONG, IF_Gbps(10ULL) }, \
{ IFM_ETHER | IFM_10G_LRM, IF_Gbps(10ULL) }, \
{ IFM_ETHER | IFM_10G_T, IF_Gbps(10ULL) }, \
{ IFM_ETHER | IFM_40G_CR4, IF_Gbps(40ULL) }, \
{ IFM_ETHER | IFM_40G_SR4, IF_Gbps(40ULL) }, \
{ IFM_ETHER | IFM_40G_LR4, IF_Gbps(40ULL) }, \
{ IFM_ETHER | IFM_1000_KX, IF_Mbps(1000) }, \
{ IFM_ETHER | IFM_10G_KX4, IF_Gbps(10ULL) }, \
{ IFM_ETHER | IFM_10G_KR, IF_Gbps(10ULL) }, \
{ IFM_ETHER | IFM_10G_CR1, IF_Gbps(10ULL) }, \
{ IFM_ETHER | IFM_20G_KR2, IF_Gbps(20ULL) }, \
{ IFM_ETHER | IFM_2500_KX, IF_Mbps(2500) }, \
{ IFM_ETHER | IFM_2500_T, IF_Mbps(2500) }, \
{ IFM_ETHER | IFM_5000_T, IF_Mbps(5000) }, \
{ IFM_ETHER | IFM_50G_PCIE, IF_Gbps(50ULL) }, \
{ IFM_ETHER | IFM_25G_PCIE, IF_Gbps(25ULL) }, \
{ IFM_ETHER | IFM_1000_SGMII, IF_Mbps(1000) }, \
{ IFM_ETHER | IFM_10G_SFI, IF_Gbps(10ULL) }, \
{ IFM_ETHER | IFM_40G_XLPPI, IF_Gbps(40ULL) }, \
{ IFM_ETHER | IFM_1000_CX_SGMII, IF_Mbps(1000) }, \
{ IFM_ETHER | IFM_40G_KR4, IF_Gbps(40ULL) }, \
{ IFM_ETHER | IFM_10G_ER, IF_Gbps(10ULL) }, \
{ IFM_ETHER | IFM_100G_CR4, IF_Gbps(100ULL) }, \
{ IFM_ETHER | IFM_100G_SR4, IF_Gbps(100ULL) }, \
{ IFM_ETHER | IFM_100G_KR4, IF_Gbps(100ULL) }, \
{ IFM_ETHER | IFM_100G_LR4, IF_Gbps(100ULL) }, \
{ IFM_ETHER | IFM_56G_R4, IF_Gbps(56ULL) }, \
{ IFM_ETHER | IFM_100_T, IF_Mbps(100ULL) }, \
{ IFM_ETHER | IFM_25G_CR, IF_Gbps(25ULL) }, \
{ IFM_ETHER | IFM_25G_KR, IF_Gbps(25ULL) }, \
{ IFM_ETHER | IFM_25G_SR, IF_Gbps(25ULL) }, \
{ IFM_ETHER | IFM_50G_CR2, IF_Gbps(50ULL) }, \
{ IFM_ETHER | IFM_50G_KR2, IF_Gbps(50ULL) }, \
{ IFM_ETHER | IFM_25G_LR, IF_Gbps(25ULL) }, \
{ IFM_ETHER | IFM_10G_AOC, IF_Gbps(10ULL) }, \
{ IFM_ETHER | IFM_25G_ACC, IF_Gbps(25ULL) }, \
{ IFM_ETHER | IFM_25G_AOC, IF_Gbps(25ULL) }, \
{ IFM_ETHER | IFM_100_SGMII, IF_Mbps(100) }, \
{ IFM_ETHER | IFM_2500_X, IF_Mbps(2500ULL) }, \
{ IFM_ETHER | IFM_5000_KR, IF_Mbps(5000ULL) }, \
{ IFM_ETHER | IFM_25G_T, IF_Gbps(25ULL) }, \
{ IFM_ETHER | IFM_25G_CR_S, IF_Gbps(25ULL) }, \
{ IFM_ETHER | IFM_25G_CR1, IF_Gbps(25ULL) }, \
{ IFM_ETHER | IFM_25G_KR_S, IF_Gbps(25ULL) }, \
{ IFM_ETHER | IFM_5000_KR_S, IF_Mbps(5000ULL) }, \
{ IFM_ETHER | IFM_5000_KR1, IF_Mbps(5000ULL) }, \
{ IFM_ETHER | IFM_25G_AUI, IF_Gbps(25ULL) }, \
{ IFM_ETHER | IFM_40G_XLAUI, IF_Gbps(40ULL) }, \
{ IFM_ETHER | IFM_40G_XLAUI_AC, IF_Gbps(40ULL) }, \
{ IFM_ETHER | IFM_40G_ER4, IF_Gbps(40ULL) }, \
{ IFM_ETHER | IFM_50G_SR2, IF_Gbps(50ULL) }, \
{ IFM_ETHER | IFM_50G_LR2, IF_Gbps(50ULL) }, \
{ IFM_ETHER | IFM_50G_LAUI2_AC, IF_Gbps(50ULL) }, \
{ IFM_ETHER | IFM_50G_LAUI2, IF_Gbps(50ULL) }, \
{ IFM_ETHER | IFM_50G_AUI2_AC, IF_Gbps(50ULL) }, \
{ IFM_ETHER | IFM_50G_AUI2, IF_Gbps(50ULL) }, \
{ IFM_ETHER | IFM_50G_CP, IF_Gbps(50ULL) }, \
{ IFM_ETHER | IFM_50G_SR, IF_Gbps(50ULL) }, \
{ IFM_ETHER | IFM_50G_LR, IF_Gbps(50ULL) }, \
{ IFM_ETHER | IFM_50G_FR, IF_Gbps(50ULL) }, \
{ IFM_ETHER | IFM_50G_KR_PAM4, IF_Gbps(50ULL) }, \
{ IFM_ETHER | IFM_25G_KR1, IF_Gbps(25ULL) }, \
{ IFM_ETHER | IFM_50G_AUI1_AC, IF_Gbps(50ULL) }, \
{ IFM_ETHER | IFM_50G_AUI1, IF_Gbps(50ULL) }, \
{ IFM_ETHER | IFM_100G_CAUI4_AC, IF_Gbps(100ULL) }, \
{ IFM_ETHER | IFM_100G_CAUI4, IF_Gbps(100ULL) }, \
{ IFM_ETHER | IFM_100G_AUI4_AC, IF_Gbps(100ULL) }, \
{ IFM_ETHER | IFM_100G_AUI4, IF_Gbps(100ULL) }, \
{ IFM_ETHER | IFM_100G_CR_PAM4, IF_Gbps(100ULL) }, \
{ IFM_ETHER | IFM_100G_KR_PAM4, IF_Gbps(100ULL) }, \
{ IFM_ETHER | IFM_100G_CP2, IF_Gbps(100ULL) }, \
{ IFM_ETHER | IFM_100G_SR2, IF_Gbps(100ULL) }, \
{ IFM_ETHER | IFM_100G_DR, IF_Gbps(100ULL) }, \
{ IFM_ETHER | IFM_100G_KR2_PAM4, IF_Gbps(100ULL) }, \
{ IFM_ETHER | IFM_100G_CAUI2_AC, IF_Gbps(100ULL) }, \
{ IFM_ETHER | IFM_100G_CAUI2, IF_Gbps(100ULL) }, \
{ IFM_ETHER | IFM_100G_AUI2_AC, IF_Gbps(100ULL) }, \
{ IFM_ETHER | IFM_100G_AUI2, IF_Gbps(100ULL) }, \
{ IFM_ETHER | IFM_200G_CR4_PAM4, IF_Gbps(200ULL) }, \
{ IFM_ETHER | IFM_200G_SR4, IF_Gbps(200ULL) }, \
{ IFM_ETHER | IFM_200G_FR4, IF_Gbps(200ULL) }, \
{ IFM_ETHER | IFM_200G_LR4, IF_Gbps(200ULL) }, \
{ IFM_ETHER | IFM_200G_DR4, IF_Gbps(200ULL) }, \
{ IFM_ETHER | IFM_200G_KR4_PAM4, IF_Gbps(200ULL) }, \
{ IFM_ETHER | IFM_200G_AUI4_AC, IF_Gbps(200ULL) }, \
{ IFM_ETHER | IFM_200G_AUI4, IF_Gbps(200ULL) }, \
{ IFM_ETHER | IFM_200G_AUI8_AC, IF_Gbps(200ULL) }, \
{ IFM_ETHER | IFM_200G_AUI8, IF_Gbps(200ULL) }, \
{ IFM_ETHER | IFM_400G_FR8, IF_Gbps(400ULL) }, \
{ IFM_ETHER | IFM_400G_LR8, IF_Gbps(400ULL) }, \
{ IFM_ETHER | IFM_400G_DR4, IF_Gbps(400ULL) }, \
{ IFM_ETHER | IFM_400G_AUI8_AC, IF_Gbps(400ULL) }, \
{ IFM_ETHER | IFM_400G_AUI8, IF_Gbps(400ULL) }, \
\
{ IFM_IEEE80211 | IFM_IEEE80211_FH1, IF_Mbps(1) }, \
{ IFM_IEEE80211 | IFM_IEEE80211_FH2, IF_Mbps(2) }, \
@ -650,23 +923,18 @@ struct ifmedia_status_description {
const char *ifms_string[2];
};
#define IFM_STATUS_DESC(ifms, bit) \
#define IFM_STATUS_DESC(ifms, bit) \
(ifms)->ifms_string[((ifms)->ifms_bit & (bit)) ? 1 : 0]
#define IFM_STATUS_DESCRIPTIONS { \
#define IFM_STATUS_DESCRIPTIONS { \
{ IFM_ETHER, IFM_AVALID, IFM_ACTIVE, \
{ "no carrier", "active" } }, \
{ IFM_FDDI, IFM_AVALID, IFM_ACTIVE, \
{ "no ring", "inserted" } }, \
{ IFM_TOKEN, IFM_AVALID, IFM_ACTIVE, \
{ "no ring", "inserted" } }, \
{ IFM_IEEE80211, IFM_AVALID, IFM_ACTIVE, \
{ "no network", "active" } }, \
{ IFM_ATM, IFM_AVALID, IFM_ACTIVE, \
{ "no network", "active" } }, \
{ IFM_CARP, IFM_AVALID, IFM_ACTIVE, \
{ "backup", "master" } }, \
{ 0, 0, 0, \
{ NULL, NULL } } \
}
#endif /* _FBSD_COMPAT_NET_IF_MEDIA_H_ */

View File

@ -990,6 +990,14 @@ void if_settransmitfn(if_t ifp, if_transmit_fn_t);
void if_setqflushfn(if_t ifp, if_qflush_fn_t);
void if_setgetcounterfn(if_t ifp, if_get_counter_t);
/* accessors for struct ifreq */
static inline void*
ifr_data_get_ptr(void* ifrp)
{
struct ifreq* ifr = (struct ifreq *)ifrp;
return ifr->ifr_data;
}
#ifdef DEVICE_POLLING
enum poll_cmd { POLL_ONLY, POLL_AND_CHECK_STATUS };

View File

@ -204,46 +204,47 @@
* for a given compiler, let the compile fail if it is told to use
* a feature that we cannot live without.
*/
#ifdef lint
#define __pure2
#define __unused
#define __packed
#define __aligned(x)
#define __section(x)
#else
/*
* Compiler-dependent macros to help declare dead (non-returning) and
* pure (no side effects) functions, and unused variables. They are
* null except for versions of gcc that are known to support the features
* properly (old versions of gcc-2 supported the dead and pure features
* in a different (wrong) way). If we do not provide an implementation
* for a given compiler, let the compile fail if it is told to use
* a feature that we cannot live without.
*/
#define __weak_symbol __attribute__((__weak__))
#if !__GNUC_PREREQ__(2, 5) && !defined(__INTEL_COMPILER)
#define __dead2
#define __pure2
#define __unused
#endif
#if __GNUC__ == 2 && __GNUC_MINOR__ >= 5 && __GNUC_MINOR__ < 7 && !defined(__INTEL_COMPILER)
#define __dead2 __attribute__((__noreturn__))
#define __pure2 __attribute__((__const__))
#define __unused
/* XXX Find out what to do for __packed, __aligned and __section */
#endif
#if __GNUC_PREREQ__(2, 7)
#if __GNUC_PREREQ__(2, 7) || defined(__INTEL_COMPILER)
#define __dead2 __attribute__((__noreturn__))
#define __pure2 __attribute__((__const__))
#define __unused __attribute__((__unused__))
#define __used __attribute__((__used__))
#define __packed __attribute__((__packed__))
#define __aligned(x) __attribute__((__aligned__(x)))
#define __section(x) __attribute__((__section__(x)))
#endif
#if __GNUC_PREREQ__(3, 1)
#define __used __attribute__((__used__))
#if __GNUC_PREREQ__(4, 3) || __has_attribute(__alloc_size__)
#define __alloc_size(x) __attribute__((__alloc_size__(x)))
#define __alloc_size2(n, x) __attribute__((__alloc_size__(n, x)))
#else
#if __GNUC_PREREQ__(2, 7)
#define __used
#endif
#endif
#if defined(__INTEL_COMPILER)
#define __pure2 __attribute__((__const__))
#define __unused __attribute__((__unused__))
#define __used __attribute__((__used__))
#define __packed __attribute__((__packed__))
#define __aligned(x) __attribute__((__aligned__(x)))
#define __section(x) __attribute__((__section__(x)))
#define __alloc_size(x)
#define __alloc_size2(n, x)
#endif
#if __GNUC_PREREQ__(4, 9) || __has_attribute(__alloc_align__)
#define __alloc_align(x) __attribute__((__alloc_align__(x)))
#else
#define __alloc_align(x)
#endif
/*

View File

@ -76,6 +76,7 @@
m_getm2((m), (len), (how), (type), M_PKTHDR)
#define mtod(m, type) ((type)((m)->m_data))
#define mtodo(m, o) ((void *)(((m)->m_data) + (o)))
// Check if the supplied mbuf has a packet header, or else panic.
#define M_ASSERTPKTHDR(m) KASSERT(m != NULL && m->m_flags & M_PKTHDR, \

View File

@ -412,18 +412,6 @@ struct ifmedia_description ifm_subtype_ethernet_descriptions[] =
struct ifmedia_description ifm_subtype_ethernet_option_descriptions[] =
IFM_SUBTYPE_ETHERNET_OPTION_DESCRIPTIONS;
struct ifmedia_description ifm_subtype_tokenring_descriptions[] =
IFM_SUBTYPE_TOKENRING_DESCRIPTIONS;
struct ifmedia_description ifm_subtype_tokenring_option_descriptions[] =
IFM_SUBTYPE_TOKENRING_OPTION_DESCRIPTIONS;
struct ifmedia_description ifm_subtype_fddi_descriptions[] =
IFM_SUBTYPE_FDDI_DESCRIPTIONS;
struct ifmedia_description ifm_subtype_fddi_option_descriptions[] =
IFM_SUBTYPE_FDDI_OPTION_DESCRIPTIONS;
struct ifmedia_description ifm_subtype_ieee80211_descriptions[] =
IFM_SUBTYPE_IEEE80211_DESCRIPTIONS;
@ -458,16 +446,6 @@ struct ifmedia_type_to_subtype ifmedia_types_to_subtypes[] = {
&ifm_subtype_ethernet_option_descriptions[0],
NULL,
},
{
&ifm_subtype_tokenring_descriptions[0],
&ifm_subtype_tokenring_option_descriptions[0],
NULL,
},
{
&ifm_subtype_fddi_descriptions[0],
&ifm_subtype_fddi_option_descriptions[0],
NULL,
},
{
&ifm_subtype_ieee80211_descriptions[0],
&ifm_subtype_ieee80211_option_descriptions[0],