Commit 41be1dc7 authored by Colin Ian King's avatar Colin Ian King Committed by Greg Kroah-Hartman

staging: rtl8712: clean up various indentation and coding style issues

There are several statements that are indented incorrectly so fix these.
Also remove unnecessary { } braces and clean up a comment.
Signed-off-by: default avatarColin Ian King <colin.king@canonical.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7c106cbb
...@@ -408,7 +408,7 @@ int r8712_get_wps_ie(u8 *in_ie, uint in_len, u8 *wps_ie, uint *wps_ielen) ...@@ -408,7 +408,7 @@ int r8712_get_wps_ie(u8 *in_ie, uint in_len, u8 *wps_ie, uint *wps_ielen)
match = true; match = true;
break; break;
} }
cnt += in_ie[cnt + 1] + 2; /* goto next */ cnt += in_ie[cnt + 1] + 2; /* goto next */
} }
return match; return match;
} }
...@@ -939,7 +939,7 @@ static void SwLedControlMode1(struct _adapter *padapter, ...@@ -939,7 +939,7 @@ static void SwLedControlMode1(struct _adapter *padapter,
} }
if (pLed->bLedLinkBlinkInProgress) { if (pLed->bLedLinkBlinkInProgress) {
del_timer(&pLed->BlinkTimer); del_timer(&pLed->BlinkTimer);
pLed->bLedLinkBlinkInProgress = false; pLed->bLedLinkBlinkInProgress = false;
} }
if (pLed->bLedBlinkInProgress) { if (pLed->bLedBlinkInProgress) {
del_timer(&pLed->BlinkTimer); del_timer(&pLed->BlinkTimer);
...@@ -991,7 +991,7 @@ static void SwLedControlMode1(struct _adapter *padapter, ...@@ -991,7 +991,7 @@ static void SwLedControlMode1(struct _adapter *padapter,
} }
if (pLed->bLedLinkBlinkInProgress) { if (pLed->bLedLinkBlinkInProgress) {
del_timer(&pLed->BlinkTimer); del_timer(&pLed->BlinkTimer);
pLed->bLedLinkBlinkInProgress = false; pLed->bLedLinkBlinkInProgress = false;
} }
if (pLed->bLedBlinkInProgress) { if (pLed->bLedBlinkInProgress) {
del_timer(&pLed->BlinkTimer); del_timer(&pLed->BlinkTimer);
...@@ -1018,7 +1018,7 @@ static void SwLedControlMode1(struct _adapter *padapter, ...@@ -1018,7 +1018,7 @@ static void SwLedControlMode1(struct _adapter *padapter,
} }
if (pLed->bLedLinkBlinkInProgress) { if (pLed->bLedLinkBlinkInProgress) {
del_timer(&pLed->BlinkTimer); del_timer(&pLed->BlinkTimer);
pLed->bLedLinkBlinkInProgress = false; pLed->bLedLinkBlinkInProgress = false;
} }
if (pLed->bLedBlinkInProgress) { if (pLed->bLedBlinkInProgress) {
del_timer(&pLed->BlinkTimer); del_timer(&pLed->BlinkTimer);
......
...@@ -259,7 +259,7 @@ int r8712_is_same_ibss(struct _adapter *adapter, struct wlan_network *pnetwork) ...@@ -259,7 +259,7 @@ int r8712_is_same_ibss(struct _adapter *adapter, struct wlan_network *pnetwork)
static int is_same_network(struct wlan_bssid_ex *src, static int is_same_network(struct wlan_bssid_ex *src,
struct wlan_bssid_ex *dst) struct wlan_bssid_ex *dst)
{ {
u16 s_cap, d_cap; u16 s_cap, d_cap;
memcpy((u8 *)&s_cap, r8712_get_capability_from_ie(src->IEs), 2); memcpy((u8 *)&s_cap, r8712_get_capability_from_ie(src->IEs), 2);
memcpy((u8 *)&d_cap, r8712_get_capability_from_ie(dst->IEs), 2); memcpy((u8 *)&d_cap, r8712_get_capability_from_ie(dst->IEs), 2);
......
...@@ -54,7 +54,7 @@ sint _r8712_init_recv_priv(struct recv_priv *precvpriv, ...@@ -54,7 +54,7 @@ sint _r8712_init_recv_priv(struct recv_priv *precvpriv,
sint i; sint i;
union recv_frame *precvframe; union recv_frame *precvframe;
memset((unsigned char *)precvpriv, 0, sizeof(struct recv_priv)); memset((unsigned char *)precvpriv, 0, sizeof(struct recv_priv));
spin_lock_init(&precvpriv->lock); spin_lock_init(&precvpriv->lock);
_init_queue(&precvpriv->free_recv_queue); _init_queue(&precvpriv->free_recv_queue);
_init_queue(&precvpriv->recv_pending_queue); _init_queue(&precvpriv->recv_pending_queue);
...@@ -325,7 +325,7 @@ static sint sta2sta_data_frame(struct _adapter *adapter, ...@@ -325,7 +325,7 @@ static sint sta2sta_data_frame(struct _adapter *adapter,
*/ */
if (memcmp(pattrib->bssid, pattrib->src, ETH_ALEN)) if (memcmp(pattrib->bssid, pattrib->src, ETH_ALEN))
return _FAIL; return _FAIL;
sta_addr = pattrib->bssid; sta_addr = pattrib->bssid;
} else if (check_fwstate(pmlmepriv, WIFI_AP_STATE)) { } else if (check_fwstate(pmlmepriv, WIFI_AP_STATE)) {
if (bmcast) { if (bmcast) {
/* For AP mode, if DA == MCAST, then BSSID should /* For AP mode, if DA == MCAST, then BSSID should
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
static void _init_stainfo(struct sta_info *psta) static void _init_stainfo(struct sta_info *psta)
{ {
memset((u8 *)psta, 0, sizeof(struct sta_info)); memset((u8 *)psta, 0, sizeof(struct sta_info));
spin_lock_init(&psta->lock); spin_lock_init(&psta->lock);
INIT_LIST_HEAD(&psta->list); INIT_LIST_HEAD(&psta->list);
INIT_LIST_HEAD(&psta->hash_list); INIT_LIST_HEAD(&psta->hash_list);
_r8712_init_sta_xmit_priv(&psta->sta_xmitpriv); _r8712_init_sta_xmit_priv(&psta->sta_xmitpriv);
......
...@@ -193,8 +193,8 @@ sint r8712_update_attrib(struct _adapter *padapter, _pkt *pkt, ...@@ -193,8 +193,8 @@ sint r8712_update_attrib(struct _adapter *padapter, _pkt *pkt,
pattrib->ether_type = ntohs(etherhdr.h_proto); pattrib->ether_type = ntohs(etherhdr.h_proto);
{ /*
/*If driver xmit ARP packet, driver can set ps mode to initial * If driver xmit ARP packet, driver can set ps mode to initial
* setting. It stands for getting DHCP or fix IP. * setting. It stands for getting DHCP or fix IP.
*/ */
if (pattrib->ether_type == 0x0806) { if (pattrib->ether_type == 0x0806) {
...@@ -206,7 +206,7 @@ sint r8712_update_attrib(struct _adapter *padapter, _pkt *pkt, ...@@ -206,7 +206,7 @@ sint r8712_update_attrib(struct _adapter *padapter, _pkt *pkt,
padapter->registrypriv.smart_ps); padapter->registrypriv.smart_ps);
} }
} }
}
memcpy(pattrib->dst, &etherhdr.h_dest, ETH_ALEN); memcpy(pattrib->dst, &etherhdr.h_dest, ETH_ALEN);
memcpy(pattrib->src, &etherhdr.h_source, ETH_ALEN); memcpy(pattrib->src, &etherhdr.h_source, ETH_ALEN);
pattrib->pctrl = 0; pattrib->pctrl = 0;
...@@ -949,7 +949,7 @@ static void alloc_hwxmits(struct _adapter *padapter) ...@@ -949,7 +949,7 @@ static void alloc_hwxmits(struct _adapter *padapter)
pxmitpriv->vo_txqueue.head = 0; pxmitpriv->vo_txqueue.head = 0;
hwxmits[1] .phwtxqueue = &pxmitpriv->vo_txqueue; hwxmits[1] .phwtxqueue = &pxmitpriv->vo_txqueue;
hwxmits[1] .sta_queue = &pxmitpriv->vo_pending; hwxmits[1] .sta_queue = &pxmitpriv->vo_pending;
pxmitpriv->vi_txqueue.head = 0; pxmitpriv->vi_txqueue.head = 0;
hwxmits[2] .phwtxqueue = &pxmitpriv->vi_txqueue; hwxmits[2] .phwtxqueue = &pxmitpriv->vi_txqueue;
hwxmits[2] .sta_queue = &pxmitpriv->vi_pending; hwxmits[2] .sta_queue = &pxmitpriv->vi_pending;
pxmitpriv->bk_txqueue.head = 0; pxmitpriv->bk_txqueue.head = 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment