Page MenuHomeFreeBSD
Files F149016578

D40171.id122143.diff
No OneTemporary
Actions

D40171.id122143.diff
View Options

Index: net/realtek-re-kmod/files/patch-if__re.c
===================================================================
--- /dev/null
+++ net/realtek-re-kmod/files/patch-if__re.c
@@ -0,0 +1,196 @@
+--- if_re.c.orig 2023-03-15 16:04:54 UTC
++++ if_re.c
+@@ -547,8 +547,7 @@ static void re_wait_phy_ups_resume(struct re_softc *sc
+ };
+ }
+
+-static void re_phy_power_up(dev)
+-device_t dev;
++static void re_phy_power_up(device_t dev)
+ {
+ struct re_softc *sc;
+ u_int8_t Data8;
+@@ -633,8 +632,7 @@ static u_int16_t re_get_phy_lp_ability(struct re_softc
+ return anlpar;
+ }
+
+-static void re_phy_power_down(dev)
+-device_t dev;
++static void re_phy_power_down(device_t dev)
+ {
+ struct re_softc *sc;
+ u_int8_t Data8;
+@@ -783,8 +781,7 @@ static void re_dma_map_txdesc(void *arg, bus_dma_segme
+ * Probe for a RealTek 8129/8139 chip. Check the PCI vendor and device
+ * IDs against our list and return a device name if we find a match.
+ */
+-static int re_probe(dev) /* Search for Realtek NIC chip */
+-device_t dev;
++static int re_probe(device_t dev) /* Search for Realtek NIC chip */
+ {
+ struct re_type *t;
+ t = re_devs;
+@@ -4243,8 +4240,7 @@ SetPCIePhyBit(
+ * Stop all chip I/O so that the kernel's probe routines don't
+ * get confused by errant DMAs when rebooting.
+ */
+-static int re_shutdown(dev) /* The same with re_stop(sc) */
+-device_t dev;
++static int re_shutdown(device_t dev) /* The same with re_stop(sc) */
+ {
+ struct re_softc *sc;
+
+@@ -6974,8 +6970,7 @@ static void re_txeof(struct re_softc *sc) /* Transmi
+ * bytes of space preceecing it so that it will be safe for us to do the
+ * 2-byte backstep even if reading from the ring at offset 0.
+ */
+-static void re_rxeof(sc) /* Receive Data OK/ERR handler */
+-struct re_softc *sc;
++static void re_rxeof(struct re_softc *sc) /* Receive Data OK/ERR handler */
+ {
+ struct mbuf *m;
+ struct ifnet *ifp;
+@@ -7363,10 +7358,7 @@ static void re_int_task_8125(void *arg, int npending)
+ CSR_WRITE_4(sc, RE_IMR0_8125, RE_INTRS);
+ }
+
+-static void re_set_multicast_reg(sc, mask0, mask4)
+-struct re_softc *sc;
+-u_int32_t mask0;
+-u_int32_t mask4;
++static void re_set_multicast_reg(struct re_softc *sc, u_int32_t mask0, u_int32_t mask4)
+ {
+ u_int8_t enable_cfg_reg_write = 0;
+
+@@ -7383,8 +7375,7 @@ u_int32_t mask4;
+ return;
+ }
+
+-static void re_set_rx_packet_filter_in_sleep_state(sc)
+-struct re_softc *sc;
++static void re_set_rx_packet_filter_in_sleep_state(struct re_softc *sc)
+ {
+ u_int32_t rxfilt;
+
+@@ -7400,8 +7391,7 @@ struct re_softc *sc;
+ return;
+ }
+
+-static void re_set_rx_packet_filter(sc)
+-struct re_softc *sc;
++static void re_set_rx_packet_filter(struct re_softc *sc)
+ {
+ struct ifnet *ifp;
+ u_int32_t rxfilt;
+@@ -7456,8 +7446,7 @@ re_hash_maddr(void *arg, struct sockaddr_dl *sdl, u_in
+ /*
+ * Program the 64-bit multicast hash filter.
+ */
+-static void re_setmulti(sc)
+-struct re_softc *sc;
++static void re_setmulti(struct re_softc *sc)
+ {
+ struct ifnet *ifp;
+ int h = 0;
+@@ -7531,10 +7520,7 @@ struct re_softc *sc;
+ return;
+ }
+
+-static int re_ioctl(ifp, command, data)
+-struct ifnet *ifp;
+-u_long command;
+-caddr_t data;
++static int re_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
+ {
+ struct re_softc *sc = ifp->if_softc;
+ struct ifreq *ifr = (struct ifreq *) data;
+@@ -7836,8 +7822,7 @@ static void re_start_timer(struct re_softc *sc)
+ #endif
+ }
+
+-static void re_tick(xsc)
+-void *xsc;
++static void re_tick(void *xsc)
+ {
+ /*called per second*/
+ struct re_softc *sc;
+@@ -8090,9 +8075,7 @@ static int re_ifmedia_upd_8125(struct ifnet *ifp)
+ /*
+ * Report current media status.
+ */
+-static void re_ifmedia_sts(ifp, ifmr)
+-struct ifnet *ifp;
+-struct ifmediareq *ifmr;
++static void re_ifmedia_sts(struct ifnet *ifp, struct ifmediareq *ifmr)
+ {
+ struct re_softc *sc;
+
+@@ -8127,9 +8110,7 @@ struct ifmediareq *ifmr;
+ return;
+ }
+
+-static void re_ifmedia_sts_8125(ifp, ifmr)
+-struct ifnet *ifp;
+-struct ifmediareq *ifmr;
++static void re_ifmedia_sts_8125(struct ifnet *ifp, struct ifmediareq *ifmr)
+ {
+ struct re_softc *sc;
+
+@@ -31105,10 +31086,7 @@ void re_driver_stop(struct re_softc *sc)
+ /*
+ * Shift out bit(s) to the EEPROM.
+ */
+-static void re_eeprom_ShiftOutBits(sc, data, count)
+-struct re_softc *sc;
+-int data;
+-int count;
++static void re_eeprom_ShiftOutBits(struct re_softc *sc, int data, int count)
+ {
+ u_int16_t x, mask;
+
+@@ -31136,8 +31114,7 @@ int count;
+ /*
+ * Shift in bit(s) from the EEPROM.
+ */
+-static u_int16_t re_eeprom_ShiftInBits(sc)
+-struct re_softc *sc;
++static u_int16_t re_eeprom_ShiftInBits(struct re_softc *sc)
+ {
+ u_int16_t x,d,i;
+ x = CSR_READ_1(sc, RE_EECMD);
+@@ -31164,8 +31141,7 @@ struct re_softc *sc;
+ /*
+ * Clean up EEprom read/write setting
+ */
+-static void re_eeprom_EEpromCleanup(sc)
+-struct re_softc *sc;
++static void re_eeprom_EEpromCleanup(struct re_softc *sc)
+ {
+ u_int16_t x;
+ x = CSR_READ_1(sc, RE_EECMD);
+@@ -31180,10 +31156,7 @@ struct re_softc *sc;
+ /*
+ * Read a word of data stored in the EEPROM at address 'addr.'
+ */
+-static void re_eeprom_getword(sc, addr, dest)
+-struct re_softc *sc;
+-int addr;
+-u_int16_t *dest;
++static void re_eeprom_getword(struct re_softc *sc, int addr, u_int16_t *dest)
+ {
+ u_int16_t x;
+
+@@ -31213,12 +31186,7 @@ u_int16_t *dest;
+ /*
+ * Read a sequence of words from the EEPROM.
+ */
+-static void re_read_eeprom(sc, dest, off, cnt, swap)
+-struct re_softc *sc;
+-caddr_t dest;
+-int off;
+-int cnt;
+-int swap;
++static void re_read_eeprom(struct re_softc *sc, caddr_t dest, int off, int cnt, int swap)
+ {
+ int i;
+ u_int16_t word = 0, *ptr;

File Metadata

Mime Type
text/plain
Expires
Sun, Mar 22, 7:22 PM (29 m, 25 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
30134169
Default Alt Text
D40171.id122143.diff (5 KB)

Event Timeline