Staging: rtl8712 : Fix line over 80 characters
This patch fixes checkpatch.pl warning in files of rtl8712 WARNING : line over 80 characters Signed-off-by: Tapasweni Pathak <tapaswenipathak@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
9d76a7e4dc
commit
57b6686ebb
7 changed files with 18 additions and 13 deletions
|
@ -468,7 +468,8 @@ void r8712_event_handle(struct _adapter *padapter, uint *peventbuf)
|
||||||
pevt_priv->event_seq++; /* update evt_seq */
|
pevt_priv->event_seq++; /* update evt_seq */
|
||||||
if (pevt_priv->event_seq > 127)
|
if (pevt_priv->event_seq > 127)
|
||||||
pevt_priv->event_seq = 0;
|
pevt_priv->event_seq = 0;
|
||||||
peventbuf = peventbuf + 2; /* move to event content, 8 bytes alignment */
|
/* move to event content, 8 bytes alignment */
|
||||||
|
peventbuf = peventbuf + 2;
|
||||||
event_callback = wlanevents[evt_code].event_callback;
|
event_callback = wlanevents[evt_code].event_callback;
|
||||||
if (event_callback)
|
if (event_callback)
|
||||||
event_callback(padapter, (u8 *)peventbuf);
|
event_callback(padapter, (u8 *)peventbuf);
|
||||||
|
|
|
@ -120,8 +120,8 @@ uint r8712_alloc_io_queue(struct _adapter *adapter)
|
||||||
INIT_LIST_HEAD(&pio_queue->pending);
|
INIT_LIST_HEAD(&pio_queue->pending);
|
||||||
spin_lock_init(&pio_queue->lock);
|
spin_lock_init(&pio_queue->lock);
|
||||||
pio_queue->pallocated_free_ioreqs_buf = kmalloc(NUM_IOREQ *
|
pio_queue->pallocated_free_ioreqs_buf = kmalloc(NUM_IOREQ *
|
||||||
(sizeof(struct io_req)) + 4,
|
(sizeof(struct io_req)) + 4,
|
||||||
GFP_ATOMIC);
|
GFP_ATOMIC);
|
||||||
if ((pio_queue->pallocated_free_ioreqs_buf) == NULL)
|
if ((pio_queue->pallocated_free_ioreqs_buf) == NULL)
|
||||||
goto alloc_io_queue_fail;
|
goto alloc_io_queue_fail;
|
||||||
memset(pio_queue->pallocated_free_ioreqs_buf, 0,
|
memset(pio_queue->pallocated_free_ioreqs_buf, 0,
|
||||||
|
|
|
@ -425,8 +425,8 @@ static int wpa_set_encryption(struct net_device *dev, struct ieee_param *param,
|
||||||
if (wep_key_len > 0) {
|
if (wep_key_len > 0) {
|
||||||
wep_key_len = wep_key_len <= 5 ? 5 : 13;
|
wep_key_len = wep_key_len <= 5 ? 5 : 13;
|
||||||
pwep = kmalloc((u32)(wep_key_len +
|
pwep = kmalloc((u32)(wep_key_len +
|
||||||
FIELD_OFFSET(struct NDIS_802_11_WEP, KeyMaterial)),
|
FIELD_OFFSET(struct NDIS_802_11_WEP,
|
||||||
GFP_ATOMIC);
|
KeyMaterial)), GFP_ATOMIC);
|
||||||
if (pwep == NULL)
|
if (pwep == NULL)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
memset(pwep, 0, sizeof(struct NDIS_802_11_WEP));
|
memset(pwep, 0, sizeof(struct NDIS_802_11_WEP));
|
||||||
|
@ -1563,7 +1563,8 @@ static int r8711_wx_set_enc(struct net_device *dev,
|
||||||
authmode = Ndis802_11AuthModeOpen;
|
authmode = Ndis802_11AuthModeOpen;
|
||||||
padapter->securitypriv.ndisauthtype = authmode;
|
padapter->securitypriv.ndisauthtype = authmode;
|
||||||
} else if (erq->flags & IW_ENCODE_RESTRICTED) {
|
} else if (erq->flags & IW_ENCODE_RESTRICTED) {
|
||||||
netdev_info(dev, "r8712u: %s: IW_ENCODE_RESTRICTED\n", __func__);
|
netdev_info(dev,
|
||||||
|
"r8712u: %s: IW_ENCODE_RESTRICTED\n", __func__);
|
||||||
padapter->securitypriv.ndisencryptstatus =
|
padapter->securitypriv.ndisencryptstatus =
|
||||||
Ndis802_11Encryption1Enabled;
|
Ndis802_11Encryption1Enabled;
|
||||||
padapter->securitypriv.AuthAlgrthm = 1; /* shared system */
|
padapter->securitypriv.AuthAlgrthm = 1; /* shared system */
|
||||||
|
|
|
@ -54,8 +54,8 @@ static int init_mp_priv(struct mp_priv *pmp_priv)
|
||||||
_init_queue(&pmp_priv->free_mp_xmitqueue);
|
_init_queue(&pmp_priv->free_mp_xmitqueue);
|
||||||
pmp_priv->pallocated_mp_xmitframe_buf = NULL;
|
pmp_priv->pallocated_mp_xmitframe_buf = NULL;
|
||||||
pmp_priv->pallocated_mp_xmitframe_buf = kmalloc(NR_MP_XMITFRAME *
|
pmp_priv->pallocated_mp_xmitframe_buf = kmalloc(NR_MP_XMITFRAME *
|
||||||
sizeof(struct mp_xmit_frame) + 4,
|
sizeof(struct mp_xmit_frame) + 4,
|
||||||
GFP_ATOMIC);
|
GFP_ATOMIC);
|
||||||
if (pmp_priv->pallocated_mp_xmitframe_buf == NULL) {
|
if (pmp_priv->pallocated_mp_xmitframe_buf == NULL) {
|
||||||
res = _FAIL;
|
res = _FAIL;
|
||||||
goto _exit_init_mp_priv;
|
goto _exit_init_mp_priv;
|
||||||
|
|
|
@ -73,8 +73,8 @@ sint _r8712_init_recv_priv(struct recv_priv *precvpriv,
|
||||||
precvpriv->adapter = padapter;
|
precvpriv->adapter = padapter;
|
||||||
precvpriv->free_recvframe_cnt = NR_RECVFRAME;
|
precvpriv->free_recvframe_cnt = NR_RECVFRAME;
|
||||||
precvpriv->pallocated_frame_buf = kmalloc(NR_RECVFRAME *
|
precvpriv->pallocated_frame_buf = kmalloc(NR_RECVFRAME *
|
||||||
sizeof(union recv_frame) + RXFRAME_ALIGN_SZ,
|
sizeof(union recv_frame) + RXFRAME_ALIGN_SZ,
|
||||||
GFP_ATOMIC);
|
GFP_ATOMIC);
|
||||||
if (precvpriv->pallocated_frame_buf == NULL)
|
if (precvpriv->pallocated_frame_buf == NULL)
|
||||||
return _FAIL;
|
return _FAIL;
|
||||||
kmemleak_not_leak(precvpriv->pallocated_frame_buf);
|
kmemleak_not_leak(precvpriv->pallocated_frame_buf);
|
||||||
|
|
|
@ -581,9 +581,11 @@ static int r871xu_drv_init(struct usb_interface *pusb_intf,
|
||||||
* address by setting bit 1 of first octet.
|
* address by setting bit 1 of first octet.
|
||||||
*/
|
*/
|
||||||
mac[0] &= 0xFE;
|
mac[0] &= 0xFE;
|
||||||
dev_info(&udev->dev, "r8712u: MAC Address from user = %pM\n", mac);
|
dev_info(&udev->dev,
|
||||||
|
"r8712u: MAC Address from user = %pM\n", mac);
|
||||||
} else
|
} else
|
||||||
dev_info(&udev->dev, "r8712u: MAC Address from efuse = %pM\n", mac);
|
dev_info(&udev->dev,
|
||||||
|
"r8712u: MAC Address from efuse = %pM\n", mac);
|
||||||
memcpy(pnetdev->dev_addr, mac, ETH_ALEN);
|
memcpy(pnetdev->dev_addr, mac, ETH_ALEN);
|
||||||
}
|
}
|
||||||
/* step 6. Load the firmware asynchronously */
|
/* step 6. Load the firmware asynchronously */
|
||||||
|
|
|
@ -382,7 +382,8 @@ static void usb_write_port_complete(struct urb *purb)
|
||||||
case 0:
|
case 0:
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
netdev_warn(padapter->pnetdev, "r8712u: pipe error: (%d)\n", purb->status);
|
netdev_warn(padapter->pnetdev,
|
||||||
|
"r8712u: pipe error: (%d)\n", purb->status);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
/* not to consider tx fragment */
|
/* not to consider tx fragment */
|
||||||
|
|
Loading…
Add table
Reference in a new issue