Attachment 219415 Details for Bug 250918 – Apply base r353844

[patch] Apply base r353844

bug250918.diff (text/plain), 3.85 KB, created by Jan Beich on 2020-11-07 03:50:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2020-11-07 03:50:16 UTC

Size: 3.85 KB

patch

obsolete

>From 096dab13f98c74c222e29048b968b93a0f9c847e Mon Sep 17 00:00:00 2001
>From: Jan Beich <jbeich@FreeBSD.org>
>Date: Sat, 7 Nov 2020 03:45:59 +0000
>Subject: [PATCH] net/intel-em-kmod: unbreak on -CURRENT
>
>link_elf_obj: symbol if_multiaddr_array undefined
>
>PR:		250918
>Approved by:	?
>---
> net/intel-em-kmod/Makefile                 |  1 +
> net/intel-em-kmod/files/patch-base-r353844 | 98 ++++++++++++++++++++++
> 2 files changed, 99 insertions(+)
> create mode 100644 net/intel-em-kmod/files/patch-base-r353844
>
>diff --git a/net/intel-em-kmod/Makefile b/net/intel-em-kmod/Makefile
>index 0790b6154805..5f2d735686e3 100644
>--- a/net/intel-em-kmod/Makefile
>+++ b/net/intel-em-kmod/Makefile
>@@ -17,5 +17,6 @@ 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"
>diff --git a/net/intel-em-kmod/files/patch-base-r353844 b/net/intel-em-kmod/files/patch-base-r353844
>new file mode 100644
>index 000000000000..17e5a00a1da2
>--- /dev/null
>+++ b/net/intel-em-kmod/files/patch-base-r353844
>@@ -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);

Actions: View | Diff

Attachments on bug 250918: 219415