diff options
| -rw-r--r-- | drivers/staging/rtl8712/rtl8712_recv.c | 4 | ||||
| -rw-r--r-- | drivers/staging/rtl8712/rtl8712_xmit.c | 2 | ||||
| -rw-r--r-- | drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 2 | ||||
| -rw-r--r-- | drivers/staging/rtl8712/rtl871x_mp_ioctl.c | 4 | ||||
| -rw-r--r-- | drivers/staging/rtl8712/rtl871x_security.c | 12 |
5 files changed, 12 insertions, 12 deletions
diff --git a/drivers/staging/rtl8712/rtl8712_recv.c b/drivers/staging/rtl8712/rtl8712_recv.c index 1332b46b6708..20fe45a43e53 100644 --- a/drivers/staging/rtl8712/rtl8712_recv.c +++ b/drivers/staging/rtl8712/rtl8712_recv.c @@ -758,7 +758,7 @@ static void query_rx_phy_status(struct _adapter *padapter, /* CCK Driver info Structure is not the same as OFDM packet.*/ pcck_buf = (struct phy_cck_rx_status *)pphy_stat; /* (1)Hardware does not provide RSSI for CCK - * (2)PWDB, Average PWDB cacluated by hardware + * (2)PWDB, Average PWDB calculated by hardware * (for rate adaptive) */ if (!cck_highpwr) { @@ -853,7 +853,7 @@ static void query_rx_phy_status(struct _adapter *padapter, rssi = query_rx_pwr_percentage(rx_pwr[i]); total_rssi += rssi; } - /* (2)PWDB, Average PWDB cacluated by hardware (for + /* (2)PWDB, Average PWDB calculated by hardware (for * rate adaptive) */ rx_pwr_all = (((pphy_head[PHY_STAT_PWDB_ALL_SHT]) >> 1) & 0x7f) diff --git a/drivers/staging/rtl8712/rtl8712_xmit.c b/drivers/staging/rtl8712/rtl8712_xmit.c index c4f03a602a2e..041508d6ec6d 100644 --- a/drivers/staging/rtl8712/rtl8712_xmit.c +++ b/drivers/staging/rtl8712/rtl8712_xmit.c @@ -302,7 +302,7 @@ u8 r8712_append_mpdu_unit(struct xmit_buf *pxmitbuf, int last_txcmdsz = 0; int padding_sz = 0; - /* 802.3->802.11 convertor */ + /* 802.3->802.11 converter */ r8712_xmitframe_coalesce(padapter, pxmitframe->pkt, pxmitframe); /* free skb struct */ r8712_xmit_complete(padapter, pxmitframe); diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c index 3518f1f0bcdd..0dc18d6bff28 100644 --- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c +++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c @@ -2322,7 +2322,7 @@ static struct iw_statistics *r871x_get_wireless_stats(struct net_device *dev) piwstats->qual.level = 0; piwstats->qual.noise = 0; } else { - /* show percentage, we need transfer dbm to orignal value. */ + /* show percentage, we need transfer dbm to original value. */ tmp_level = padapter->recvpriv.fw_rssi; tmp_qual = padapter->recvpriv.signal; tmp_noise = padapter->recvpriv.noise; diff --git a/drivers/staging/rtl8712/rtl871x_mp_ioctl.c b/drivers/staging/rtl8712/rtl871x_mp_ioctl.c index b98a596757f5..6e264a8d0087 100644 --- a/drivers/staging/rtl8712/rtl871x_mp_ioctl.c +++ b/drivers/staging/rtl8712/rtl871x_mp_ioctl.c @@ -202,7 +202,7 @@ static int mp_start_test(struct _adapter *padapter) res = _FAIL; goto end_of_mp_start_test; } - /* 3 3. join psudo AdHoc */ + /* 3 3. join pseudo AdHoc */ tgt_network->join_res = 1; tgt_network->aid = psta->aid = 1; memcpy(&tgt_network->network, &bssid, length); @@ -227,7 +227,7 @@ static int mp_stop_test(struct _adapter *padapter) spin_lock_irqsave(&pmlmepriv->lock, irqL); if (!check_fwstate(pmlmepriv, WIFI_MP_STATE)) goto end_of_mp_stop_test; - /* 3 1. disconnect psudo AdHoc */ + /* 3 1. disconnect pseudo AdHoc */ r8712_os_indicate_disconnect(padapter); /* 3 2. clear psta used in mp test mode. */ psta = r8712_get_stainfo(&padapter->stapriv, diff --git a/drivers/staging/rtl8712/rtl871x_security.c b/drivers/staging/rtl8712/rtl871x_security.c index 62d56943238f..bd83fb492c45 100644 --- a/drivers/staging/rtl8712/rtl871x_security.c +++ b/drivers/staging/rtl8712/rtl871x_security.c @@ -833,7 +833,7 @@ static void mix_column(u8 *in, u8 *out) u8 add1b[4]; u8 add1bf7[4]; u8 rotl[4]; - u8 swap_halfs[4]; + u8 swap_halves[4]; u8 andf7[4]; u8 rotr[4]; u8 temp[4]; @@ -845,10 +845,10 @@ static void mix_column(u8 *in, u8 *out) else add1b[i] = 0x00; } - swap_halfs[0] = in[2]; /* Swap halves */ - swap_halfs[1] = in[3]; - swap_halfs[2] = in[0]; - swap_halfs[3] = in[1]; + swap_halves[0] = in[2]; /* Swap halves */ + swap_halves[1] = in[3]; + swap_halves[2] = in[0]; + swap_halves[3] = in[1]; rotl[0] = in[3]; /* Rotate left 8 bits */ rotl[1] = in[0]; rotl[2] = in[1]; @@ -872,7 +872,7 @@ static void mix_column(u8 *in, u8 *out) rotr[2] = rotr[3]; rotr[3] = temp[0]; xor_32(add1bf7, rotr, temp); - xor_32(swap_halfs, rotl, tempb); + xor_32(swap_halves, rotl, tempb); xor_32(temp, tempb, out); } |
