1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
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);
|
