Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cbc63fdc authored by Ivan Safonov's avatar Ivan Safonov Committed by Greg Kroah-Hartman
Browse files

staging:r8188eu: remove ff_hwaddr member of recv_priv structure 



Its value used instead.

Signed-off-by: default avatarIvan Safonov <insafonov@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent dbddb97e

drivers/staging/rtl8188eu/hal/usb_halinit.c

+1 −3
Original line number Diff line number Diff line
@@ -994,12 +994,10 @@ u32 rtw_hal_inirp_init(struct adapter *Adapter) 
	RT_TRACE(_module_hci_hal_init_c_, _drv_info_,

		 ("===> usb_inirp_init\n"));



	precvpriv->ff_hwaddr = RECV_BULK_IN_ADDR;



	/* issue Rx irp to receive data */

	precvbuf = (struct recv_buf *)precvpriv->precv_buf;

	for (i = 0; i < NR_RECVBUFF; i++) {

		if (usb_read_port(Adapter, precvpriv->ff_hwaddr, precvbuf) == false) {

		if (usb_read_port(Adapter, RECV_BULK_IN_ADDR, precvbuf) == false) {

			RT_TRACE(_module_hci_hal_init_c_, _drv_err_, ("usb_rx_init: usb_read_port error\n"));

			status = _FAIL;

			goto exit;

drivers/staging/rtl8188eu/include/rtw_recv.h

+0 −1
Original line number Diff line number Diff line
@@ -174,7 +174,6 @@ struct recv_priv { 
	u64	rx_drop;

	u64	last_rx_bytes;



	uint	ff_hwaddr;

	u8	rx_pending_cnt;



	struct tasklet_struct irq_prepare_beacon_tasklet;

drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c

+3 −3
Original line number Diff line number Diff line
@@ -403,7 +403,7 @@ static void usb_read_port_complete(struct urb *purb, struct pt_regs *regs) 
			RT_TRACE(_module_hci_ops_os_c_, _drv_err_,

				 ("usb_read_port_complete: (purb->actual_length > MAX_RECVBUF_SZ) || (purb->actual_length < RXDESC_SIZE)\n"));

			precvbuf->reuse = true;

			usb_read_port(adapt, precvpriv->ff_hwaddr, precvbuf);

			usb_read_port(adapt, RECV_BULK_IN_ADDR, precvbuf);

			DBG_88E("%s()-%d: RX Warning!\n", __func__, __LINE__);

		} else {

			skb_put(precvbuf->pskb, purb->actual_length);
@@ -414,7 +414,7 @@ static void usb_read_port_complete(struct urb *purb, struct pt_regs *regs) 


			precvbuf->pskb = NULL;

			precvbuf->reuse = false;

			usb_read_port(adapt, precvpriv->ff_hwaddr, precvbuf);

			usb_read_port(adapt, RECV_BULK_IN_ADDR, precvbuf);

		}

	} else {

		RT_TRACE(_module_hci_ops_os_c_, _drv_err_, ("usb_read_port_complete : purb->status(%d) != 0\n", purb->status));
@@ -437,7 +437,7 @@ static void usb_read_port_complete(struct urb *purb, struct pt_regs *regs) 
		case -EOVERFLOW:

			adapt->HalData->srestpriv.Wifi_Error_Status = USB_READ_PORT_FAIL;

			precvbuf->reuse = true;

			usb_read_port(adapt, precvpriv->ff_hwaddr, precvbuf);

			usb_read_port(adapt, RECV_BULK_IN_ADDR, precvbuf);

			break;

		case -EINPROGRESS:

			DBG_88E("ERROR: URB IS IN PROGRESS!\n");