From 015ea9369b60b89dcbe997a53b0f4d11d355e8d8 Mon Sep 17 00:00:00 2001 From: Ed Maste Date: Fri, 27 Jul 2012 15:28:10 -0400 Subject: [PATCH 4/4] Backport FreeBSD netdev to 1.6 --- lib/netdev-bsd.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git lib/netdev-bsd.c lib/netdev-bsd.c index 0b1a37c..17d7f72 100644 --- lib/netdev-bsd.c +++ lib/netdev-bsd.c @@ -941,49 +941,49 @@ netdev_bsd_parse_media(int media) case IFM_10_5: case IFM_10_STP: case IFM_10_T: - supported |= half_duplex ? NETDEV_F_10MB_HD : NETDEV_F_10MB_FD; - supported |= NETDEV_F_COPPER; + supported |= half_duplex ? OFPPF_10MB_HD : OFPPF_10MB_FD; + supported |= OFPPF_COPPER; break; case IFM_10_FL: - supported |= half_duplex ? NETDEV_F_10MB_HD : NETDEV_F_10MB_FD; - supported |= NETDEV_F_FIBER; + supported |= half_duplex ? OFPPF_10MB_HD : OFPPF_10MB_FD; + supported |= OFPPF_FIBER; break; case IFM_100_T2: case IFM_100_T4: case IFM_100_TX: case IFM_100_VG: - supported |= half_duplex ? NETDEV_F_100MB_HD : NETDEV_F_100MB_FD; - supported |= NETDEV_F_COPPER; + supported |= half_duplex ? OFPPF_100MB_HD : OFPPF_100MB_FD; + supported |= OFPPF_COPPER; break; case IFM_100_FX: - supported |= half_duplex ? NETDEV_F_100MB_HD : NETDEV_F_100MB_FD; - supported |= NETDEV_F_FIBER; + supported |= half_duplex ? OFPPF_100MB_HD : OFPPF_100MB_FD; + supported |= OFPPF_FIBER; break; case IFM_1000_CX: case IFM_1000_T: - supported |= half_duplex ? NETDEV_F_1GB_HD : NETDEV_F_1GB_FD; - supported |= NETDEV_F_COPPER; + supported |= half_duplex ? OFPPF_1GB_HD : OFPPF_1GB_FD; + supported |= OFPPF_COPPER; break; case IFM_1000_LX: case IFM_1000_SX: - supported |= half_duplex ? NETDEV_F_1GB_HD : NETDEV_F_1GB_FD; - supported |= NETDEV_F_FIBER; + supported |= half_duplex ? OFPPF_1GB_HD : OFPPF_1GB_FD; + supported |= OFPPF_FIBER; break; case IFM_10G_CX4: - supported |= NETDEV_F_10GB_FD; - supported |= NETDEV_F_COPPER; + supported |= OFPPF_10GB_FD; + supported |= OFPPF_COPPER; break; case IFM_10G_LR: case IFM_10G_SR: - supported |= NETDEV_F_10GB_FD; - supported |= NETDEV_F_FIBER; + supported |= OFPPF_10GB_FD; + supported |= OFPPF_FIBER; break; default: @@ -991,11 +991,11 @@ netdev_bsd_parse_media(int media) } if (IFM_SUBTYPE(media) == IFM_AUTO) { - supported |= NETDEV_F_AUTONEG; + supported |= OFPPF_AUTONEG; } /* if (media & IFM_ETH_FMASK) { - supported |= NETDEV_F_PAUSE; + supported |= OFPPF_PAUSE; } */ @@ -1011,8 +1011,8 @@ netdev_bsd_parse_media(int media) */ static int netdev_bsd_get_features(const struct netdev *netdev, - enum netdev_features *current, uint32_t *advertised, - enum netdev_features *supported, uint32_t *peer) + uint32_t *current, uint32_t *advertised, + uint32_t *supported, uint32_t *peer) { struct ifmediareq ifmr; int *media_list; -- 1.7.10.3