diff options
Diffstat (limited to 'net/realtek-re-kmod/files/patch-if__re.c')
| -rw-r--r-- | net/realtek-re-kmod/files/patch-if__re.c | 139 |
1 files changed, 139 insertions, 0 deletions
diff --git a/net/realtek-re-kmod/files/patch-if__re.c b/net/realtek-re-kmod/files/patch-if__re.c new file mode 100644 index 000000000000..95a835282ae4 --- /dev/null +++ b/net/realtek-re-kmod/files/patch-if__re.c @@ -0,0 +1,139 @@ +--- if_re.c.orig 2020-06-18 16:22:59 UTC ++++ if_re.c +@@ -62,8 +62,8 @@ __FBSDID("$FreeBSD: src/sys/dev/re/if_re.c,v " RE_VERS + #include <sys/malloc.h> + #include <sys/kernel.h> + #include <sys/socket.h> ++#include <sys/sysctl.h> + #include <sys/taskqueue.h> +-#include <sys/random.h> + + #include <net/if.h> + #include <net/if_var.h> +@@ -85,7 +85,7 @@ __FBSDID("$FreeBSD: src/sys/dev/re/if_re.c,v " RE_VERS + #include <sys/endian.h> + + #include <dev/mii/mii.h> +-#include <dev/re/if_rereg.h> ++#include "if_rereg.h" + #ifdef ENABLE_FIBER_SUPPORT + #include <dev/re/if_fiber.h> + #endif //ENABLE_FIBER_SUPPORT +@@ -258,34 +258,48 @@ static void re_hw_start_unlock(struct re_softc *sc); + static void re_hw_start_unlock_8125(struct re_softc *sc); + + /* Tunables. */ ++SYSCTL_NODE(_hw, OID_AUTO, re, CTLFLAG_RW | CTLFLAG_MPSAFE, 0, ""); + static int msi_disable = 1; +-TUNABLE_INT("hw.re.msi_disable", &msi_disable); ++SYSCTL_INT(_hw_re, OID_AUTO, msi_disable, CTLFLAG_RDTUN, &msi_disable, 0, ++ ""); + static int msix_disable = 0; +-TUNABLE_INT("hw.re.msix_disable", &msix_disable); ++SYSCTL_INT(_hw_re, OID_AUTO, msix_disable, CTLFLAG_RDTUN, &msix_disable, 0, ++ ""); + static int prefer_iomap = 0; +-TUNABLE_INT("hw.re.prefer_iomap", &prefer_iomap); ++SYSCTL_INT(_hw_re, OID_AUTO, prefer_iomap, CTLFLAG_RDTUN, &prefer_iomap, 0, ++ ""); + #ifdef ENABLE_EEE + static int eee_enable = 1; + #else + static int eee_enable = 0; + #endif +-TUNABLE_INT("hw.re.eee_enable", &eee_enable); ++SYSCTL_INT(_hw_re, OID_AUTO, eee_enable, CTLFLAG_RDTUN, &eee_enable, 0, ++ ""); + static int phy_power_saving = 1; +-TUNABLE_INT("hw.re.phy_power_saving", &phy_power_saving); ++SYSCTL_INT(_hw_re, OID_AUTO, phy_power_saving, CTLFLAG_RDTUN, ++ &phy_power_saving, 0, ++ ""); + static int phy_mdix_mode = RE_ETH_PHY_AUTO_MDI_MDIX; +-TUNABLE_INT("hw.re.phy_mdix_mode", &phy_mdix_mode); ++SYSCTL_INT(_hw_re, OID_AUTO, phy_mdix_mode, CTLFLAG_RDTUN, &phy_mdix_mode, 0, ++ ""); + #ifdef ENABLE_S5WOL + static int s5wol = 1; + #else + static int s5wol = 0; +-TUNABLE_INT("hw.re.s5wol", &s5wol); ++SYSCTL_INT(_hw_re, OID_AUTO, s5wol, CTLFLAG_RDTUN, &s5wol, 0, ++ ""); + #endif + #ifdef ENABLE_S0_MAGIC_PACKET + static int s0_magic_packet = 1; + #else + static int s0_magic_packet = 0; + #endif +-TUNABLE_INT("hw.re.s0_magic_packet", &s0_magic_packet); ++SYSCTL_INT(_hw_re, OID_AUTO, s0_magic_packet, CTLFLAG_RDTUN, ++ &s0_magic_packet, 0, ++ ""); ++static int max_rx_mbuf_sz = MJUM9BYTES; ++SYSCTL_INT(_hw_re, OID_AUTO, max_rx_mbuf_sz, CTLFLAG_RDTUN, &max_rx_mbuf_sz, 0, ++ ""); + + #define RE_CSUM_FEATURES (CSUM_IP | CSUM_TCP | CSUM_UDP) + +@@ -3428,16 +3442,6 @@ is_valid_ether_addr(const u_int8_t * addr) + return !is_multicast_ether_addr(addr) && !is_zero_ether_addr(addr); + } + +-static inline void +-random_ether_addr(u_int8_t * dst) +-{ +- if (read_random(dst, 6) == 0) +- arc4rand(dst, 6, 0); +- +- dst[0] &= 0xfe; +- dst[0] |= 0x02; +-} +- + static void re_disable_now_is_oob(struct re_softc *sc) + { + if (sc->re_hw_supp_now_is_oob_ver == 1) +@@ -3889,7 +3893,7 @@ static void re_get_hw_mac_address(struct re_softc *sc, + + if (!is_valid_ether_addr(eaddr)) { + device_printf(dev,"Invalid ether addr: %6D\n", eaddr, ":"); +- random_ether_addr(eaddr); ++ ether_gen_addr(sc->re_ifp, (struct ether_addr *)eaddr); + device_printf(dev,"Random ether addr: %6D\n", eaddr, ":"); + } + +@@ -4291,9 +4295,9 @@ static void re_init_software_variable(struct re_softc + + sc->re_rx_mbuf_sz = sc->max_jumbo_frame_size + ETHER_VLAN_ENCAP_LEN + ETHER_HDR_LEN + ETHER_CRC_LEN + RE_ETHER_ALIGN + 1; + +- if (sc->re_rx_mbuf_sz > MJUM9BYTES) { +- sc->max_jumbo_frame_size -= (sc->re_rx_mbuf_sz - MJUM9BYTES); +- sc->re_rx_mbuf_sz = MJUM9BYTES; ++ if (sc->re_rx_mbuf_sz > max_rx_mbuf_sz) { ++ sc->max_jumbo_frame_size -= (sc->re_rx_mbuf_sz - max_rx_mbuf_sz); ++ sc->re_rx_mbuf_sz = max_rx_mbuf_sz; + } + + switch(sc->re_type) { +@@ -8640,7 +8644,9 @@ struct re_softc *sc; + } + + /* now program new ones */ +-#if OS_VER > VERSION(6,0) ++#if OS_VER >= VERSION(12,0) ++ if_maddr_rlock(ifp); ++#elif OS_VER > VERSION(6,0) + IF_ADDR_LOCK(ifp); + #endif + #if OS_VER < VERSION(4,9) +@@ -8662,7 +8668,9 @@ struct re_softc *sc; + hashes[1] |= (1 << (h - 32)); + mcnt++; + } +-#if OS_VER > VERSION(6,0) ++#if OS_VER >= VERSION(12,0) ++ if_maddr_runlock(ifp); ++#elif OS_VER > VERSION(6,0) + IF_ADDR_UNLOCK(ifp); + #endif + |