Page MenuHomeFreeBSD
Files F140630344

D4271.id54425.diff
No OneTemporary
Actions

D4271.id54425.diff
View Options

Index: head/sys/dev/usb/wlan/if_urtwn.c
===================================================================
--- head/sys/dev/usb/wlan/if_urtwn.c
+++ head/sys/dev/usb/wlan/if_urtwn.c
@@ -2748,8 +2748,23 @@
static __inline int
urtwn_dma_init(struct urtwn_softc *sc)
{
+ int error;
+
+ /* Initialize LLT table. */
+ error = urtwn_llt_init(sc);
+ if (error != 0)
+ return (error);
+
+ error = sc->sc_dma_init(sc);
+ if (error != 0)
+ return (error);
- return sc->sc_dma_init(sc);
+ /* Set Tx/Rx transfer page size. */
+ urtwn_write_1(sc, R92C_PBP,
+ SM(R92C_PBP_PSRX, R92C_PBP_128) |
+ SM(R92C_PBP_PSTX, R92C_PBP_128));
+
+ return (0);
}
static int
@@ -2757,12 +2772,6 @@
{
int hashq, hasnq, haslq, nqueues, nqpages, nrempages;
uint32_t reg;
- int error;
-
- /* Initialize LLT table. */
- error = urtwn_llt_init(sc);
- if (error != 0)
- return (error);
/* Get Tx queues to USB endpoints mapping. */
hashq = hasnq = haslq = 0;
@@ -2825,10 +2834,6 @@
/* Set Tx/Rx transfer page boundary. */
urtwn_write_2(sc, R92C_TRXFF_BNDY + 2, 0x27ff);
- /* Set Tx/Rx transfer page size. */
- urtwn_write_1(sc, R92C_PBP,
- SM(R92C_PBP_PSRX, R92C_PBP_128) |
- SM(R92C_PBP_PSTX, R92C_PBP_128));
return (0);
}
@@ -2838,12 +2843,6 @@
struct usb_interface *iface;
uint32_t reg;
int nqueues;
- int error;
-
- /* Initialize LLT table. */
- error = urtwn_llt_init(sc);
- if (error != 0)
- return (error);
/* Get Tx queues to USB endpoints mapping. */
iface = usbd_get_iface(sc->sc_udev, 0);
@@ -2875,11 +2874,6 @@
/* Set Tx/Rx transfer page boundary. */
urtwn_write_2(sc, R92C_TRXFF_BNDY + 2, 0x23ff);
- /* Set Tx/Rx transfer page size. */
- urtwn_write_1(sc, R92C_PBP,
- SM(R92C_PBP_PSRX, R92C_PBP_128) |
- SM(R92C_PBP_PSTX, R92C_PBP_128));
-
return (0);
}

File Metadata

Mime Type
text/plain
Expires
Sat, Dec 27, 4:15 AM (19 h, 56 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27297280
Default Alt Text
D4271.id54425.diff (1 KB)

Event Timeline