Index: head/net/intel-em-kmod/Makefile =================================================================== --- head/net/intel-em-kmod/Makefile (revision 556548) +++ head/net/intel-em-kmod/Makefile (revision 556549) @@ -1,21 +1,22 @@ # Created by: Franco Fichtner # $FreeBSD$ PORTNAME= em PORTVERSION= 7.7.8 PORTREVISION= 0 PORTEPOCH= 0 MASTER_SITE_SUBDIR= 17509/eng MAINTAINER= freebsd@intel.com COMMENT= Gigabit FreeBSD Base Drivers for Intel(R) Ethernet BROKEN_armv6= fails to compile: implicit declaration of function 'cp15_pmccntr_get' is invalid in C99 MAX_NETMAP_OSVERSION= 1199999 # Doesn't build w/NETMAP on 12 MASTERDIR= ${.CURDIR}/../intel-ixl-kmod PKGDIR= ${.CURDIR} DISTINFO_FILE= ${.CURDIR}/distinfo +PATCHDIR= ${.CURDIR}/files .include "${MASTERDIR}/Makefile" Index: head/net/intel-em-kmod/files/patch-base-r353844 =================================================================== --- head/net/intel-em-kmod/files/patch-base-r353844 (nonexistent) +++ head/net/intel-em-kmod/files/patch-base-r353844 (revision 556549) @@ -0,0 +1,98 @@ +https://svnweb.freebsd.org/changeset/base/353844 + +--- if_em.c.orig 2020-04-08 15:13:17 UTC ++++ if_em.c +@@ -2275,7 +2275,11 @@ em_disable_promisc(struct adapter *adapter) + if (if_getflags(ifp) & IFF_ALLMULTI) + mcnt = MAX_NUM_MULTICAST_ADDRESSES; + else ++#if __FreeBSD_version > 1300053 ++ mcnt = if_llmaddr_count(ifp); ++#else + mcnt = if_multiaddr_count(ifp, MAX_NUM_MULTICAST_ADDRESSES); ++#endif + /* Don't disable if in MAX groups */ + if (mcnt < MAX_NUM_MULTICAST_ADDRESSES) + reg_rctl &= (~E1000_RCTL_MPE); +@@ -2283,7 +2287,21 @@ em_disable_promisc(struct adapter *adapter) + E1000_WRITE_REG(&adapter->hw, E1000_RCTL, reg_rctl); + } + ++#if __FreeBSD_version > 1300053 ++static u_int ++em_copy_maddr(void *arg, struct sockaddr_dl *sdl, u_int cnt) ++{ ++ u8 *mta = arg; + ++ if (cnt == MAX_NUM_MULTICAST_ADDRESSES) ++ return (1); ++ ++ bcopy(LLADDR(sdl), &mta[cnt * ETHER_ADDR_LEN], ETHER_ADDR_LEN); ++ ++ return (1); ++} ++#endif ++ + /********************************************************************* + * Multicast Update + * +@@ -2314,7 +2332,11 @@ em_set_multi(struct adapter *adapter) + msec_delay(5); + } + ++#if __FreeBSD_version > 1300053 ++ mcnt = if_foreach_llmaddr(ifp, em_copy_maddr, mta); ++#else + if_multiaddr_array(ifp, mta, &mcnt, MAX_NUM_MULTICAST_ADDRESSES); ++#endif + + if (mcnt >= MAX_NUM_MULTICAST_ADDRESSES) { + reg_rctl = E1000_READ_REG(&adapter->hw, E1000_RCTL); +--- if_lem.c.orig 2020-04-08 15:13:17 UTC ++++ if_lem.c +@@ -2019,7 +2019,11 @@ lem_disable_promisc(struct adapter *adapter) + if (if_getflags(ifp) & IFF_ALLMULTI) + mcnt = MAX_NUM_MULTICAST_ADDRESSES; + else ++#if __FreeBSD_version > 1300053 ++ mcnt = if_llmaddr_count(ifp); ++#else + mcnt = if_multiaddr_count(ifp, MAX_NUM_MULTICAST_ADDRESSES); ++#endif + + /* Don't disable if in MAX groups */ + if (mcnt < MAX_NUM_MULTICAST_ADDRESSES) +@@ -2028,7 +2032,21 @@ lem_disable_promisc(struct adapter *adapter) + E1000_WRITE_REG(&adapter->hw, E1000_RCTL, reg_rctl); + } + ++#if __FreeBSD_version > 1300053 ++static u_int ++em_copy_maddr(void *arg, struct sockaddr_dl *sdl, u_int cnt) ++{ ++ u8 *mta = arg; + ++ if (cnt == MAX_NUM_MULTICAST_ADDRESSES) ++ return (1); ++ ++ bcopy(LLADDR(sdl), &mta[cnt * ETHER_ADDR_LEN], ETHER_ADDR_LEN); ++ ++ return (1); ++} ++#endif ++ + /********************************************************************* + * Multicast Update + * +@@ -2059,7 +2077,11 @@ lem_set_multi(struct adapter *adapter) + msec_delay(5); + } + ++#if __FreeBSD_version > 1300053 ++ mcnt = if_foreach_llmaddr(ifp, em_copy_maddr, mta); ++#else + if_multiaddr_array(ifp, mta, &mcnt, MAX_NUM_MULTICAST_ADDRESSES); ++#endif + + if (mcnt >= MAX_NUM_MULTICAST_ADDRESSES) { + reg_rctl = E1000_READ_REG(&adapter->hw, E1000_RCTL); Property changes on: head/net/intel-em-kmod/files/patch-base-r353844 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property