leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging:r8188eu: remove ff_hwaddr member of recv_priv structure

Browse Source 
Its value used instead.

Signed-off-by: Ivan Safonov <insafonov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ivan Safonov 2016-10-08 01:01:07 +07:00 committed by Greg Kroah-Hartman
parent dbddb97ec1
commit cbc63fdc28
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/rtl8188eu/hal/usb_halinit.c
View File

@ -994,12 +994,10 @@ u32 rtw_hal_inirp_init(struct adapter *Adapter)
RT_TRACE(_module_hci_hal_init_c_, _drv_info_, RT_TRACE(_module_hci_hal_init_c_, _drv_info_,
("===> usb_inirp_init\n")); ("===> usb_inirp_init\n"));
precvpriv->ff_hwaddr = RECV_BULK_IN_ADDR;
/* issue Rx irp to receive data */ /* issue Rx irp to receive data */
precvbuf = (struct recv_buf *)precvpriv->precv_buf; precvbuf = (struct recv_buf *)precvpriv->precv_buf;
for (i = 0; i < NR_RECVBUFF; i++) { 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")); RT_TRACE(_module_hci_hal_init_c_, _drv_err_, ("usb_rx_init: usb_read_port error\n"));
status = _FAIL; status = _FAIL;
goto exit; goto exit;

1
drivers/staging/rtl8188eu/include/rtw_recv.h
View File

@ -174,7 +174,6 @@ struct recv_priv {
u64 rx_drop; u64 rx_drop;
u64 last_rx_bytes; u64 last_rx_bytes;
uint ff_hwaddr;
u8 rx_pending_cnt; u8 rx_pending_cnt;
struct tasklet_struct irq_prepare_beacon_tasklet; struct tasklet_struct irq_prepare_beacon_tasklet;

6
drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c
View File

@ -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_, 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")); ("usb_read_port_complete: (purb->actual_length > MAX_RECVBUF_SZ) || (purb->actual_length < RXDESC_SIZE)\n"));
precvbuf->reuse = true; 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__); DBG_88E("%s()-%d: RX Warning!\n", __func__, __LINE__);
} else { } else {
skb_put(precvbuf->pskb, purb->actual_length); 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->pskb = NULL;
precvbuf->reuse = false; precvbuf->reuse = false;
usb_read_port(adapt, precvpriv->ff_hwaddr, precvbuf); usb_read_port(adapt, RECV_BULK_IN_ADDR, precvbuf);
} }
} else { } else {
RT_TRACE(_module_hci_ops_os_c_, _drv_err_, ("usb_read_port_complete : purb->status(%d) != 0\n", purb->status)); 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: case -EOVERFLOW:
adapt->HalData->srestpriv.Wifi_Error_Status = USB_READ_PORT_FAIL; adapt->HalData->srestpriv.Wifi_Error_Status = USB_READ_PORT_FAIL;
precvbuf->reuse = true; precvbuf->reuse = true;
usb_read_port(adapt, precvpriv->ff_hwaddr, precvbuf); usb_read_port(adapt, RECV_BULK_IN_ADDR, precvbuf);
break; break;
case -EINPROGRESS: case -EINPROGRESS:
DBG_88E("ERROR: URB IS IN PROGRESS!\n"); DBG_88E("ERROR: URB IS IN PROGRESS!\n");