diff --git a/README.md b/README.md
index 62b0264..925cb55 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,8 @@ The performance and code quality has been improved and thats about time.
# HowTo build/install
1. You will need to blacklist another driver in order to use this one instead of the kernel provided.
- We included a "realtek_blacklist.conf" file in the folder. "cp realtek_blacklist.conf /etc/modprobe.d"
+ We included a "realtek_blacklist.conf" file in the folder:
+2. "cp realtek_blacklist.conf /etc/modprobe.d/"
3. "make && make install"
4. "rmmod 8188eu && insmod 8188eu.ko"
@@ -29,7 +30,7 @@ airmon-ng check-kill
ip link set down
iw dev set type monitor
```
-Frame injection test may be performerd with
+Frame injection test may be performed with
```
aireplay -9
```
@@ -55,7 +56,6 @@ unmanaged-devices=mac:A7:A7:A7:A7:A7
```
# TODO
-* Fix a issue where the interface is down on startup
* Implement txpower control
* Finish up the elimination of the wrapper _rtw_memset.
diff --git a/os_dep/linux/ioctl_cfg80211.c b/os_dep/linux/ioctl_cfg80211.c
index a7c9259..609f9c6 100644
--- a/os_dep/linux/ioctl_cfg80211.c
+++ b/os_dep/linux/ioctl_cfg80211.c
@@ -1993,10 +1993,10 @@ static int cfg80211_rtw_set_default_key(struct wiphy *wiphy,
struct security_priv *psecuritypriv = &padapter->securitypriv;
#define SET_DEF_KEY_PARAM_FMT " key_index=%d"
-#define SET_DEF_KEY_PARAM_ARG, key_index
+#define SET_DEF_KEY_PARAM_ARG , key_index
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 38)) || defined(COMPAT_KERNEL_RELEASE)
#define SET_DEF_KEY_PARAM_FMT_2_6_38 ", unicast=%d, multicast=%d"
- #define SET_DEF_KEY_PARAM_ARG_2_6_38, unicast, multicast
+ #define SET_DEF_KEY_PARAM_ARG_2_6_38 , unicast, multicast
#else
#define SET_DEF_KEY_PARAM_FMT_2_6_38 ""
#define SET_DEF_KEY_PARAM_ARG_2_6_38
diff --git a/os_dep/linux/recv_linux.c b/os_dep/linux/recv_linux.c
index d099f69..89f3bba 100644
--- a/os_dep/linux/recv_linux.c
+++ b/os_dep/linux/recv_linux.c
@@ -127,7 +127,7 @@ int rtw_os_alloc_recvframe(_adapter *padapter, union recv_frame *precvframe, u8
res = _FAIL;
#else
if ((pattrib->mfrag == 1) && (pattrib->frag_num == 0)) {
- RTW_INFO("%s: alloc_skb fail , drop frag frame\n", __FUNCTION__);
+ RTW_INFO("%s: alloc_skb fail , drop frag frame\n", __func__);
/* rtw_free_recvframe(precvframe, pfree_recv_queue); */
res = _FAIL;
goto exit_rtw_os_recv_resource_alloc;
@@ -144,7 +144,7 @@ int rtw_os_alloc_recvframe(_adapter *padapter, union recv_frame *precvframe, u8
precvframe->u.hdr.rx_head = precvframe->u.hdr.rx_data = precvframe->u.hdr.rx_tail = pdata;
precvframe->u.hdr.rx_end = pdata + alloc_sz;
} else {
- RTW_INFO("%s: rtw_skb_clone fail\n", __FUNCTION__);
+ RTW_INFO("%s: rtw_skb_clone fail\n", __func__);
/* rtw_free_recvframe(precvframe, pfree_recv_queue); */
/*exit_rtw_os_recv_resource_alloc;*/
res = _FAIL;
@@ -281,7 +281,7 @@ int rtw_os_recvbuf_resource_free(_adapter *padapter, struct recv_buf *precvbuf)
}
-_pkt *rtw_os_alloc_msdu_pkt(union recv_frame *prframe, const u8 *da, const u8 *sa, u8 *msdu ,u16 msdu_len)
+_pkt *rtw_os_alloc_msdu_pkt(union recv_frame *prframe, const u8 *da, const u8 *sa, u8 *msdu, u16 msdu_len)
{
u16 eth_type;
u8 *data_ptr;
@@ -305,7 +305,7 @@ _pkt *rtw_os_alloc_msdu_pkt(union recv_frame *prframe, const u8 *da, const u8 *s
sub_skb->len = msdu_len;
skb_set_tail_pointer(sub_skb, msdu_len);
} else {
- RTW_INFO("%s(): rtw_skb_clone() Fail!!!\n", __FUNCTION__);
+ RTW_INFO("%s(): rtw_skb_clone() Fail!!!\n", __func__);
return NULL;
}
}
@@ -399,7 +399,7 @@ void dynamic_napi_th_chk (_adapter *adapter)
if (adapter->registrypriv.en_napi) {
struct dvobj_priv *dvobj;
struct registry_priv *registry;
-
+
dvobj = adapter_to_dvobj(adapter);
registry = &adapter->registrypriv;
if (dvobj->traffic_stat.cur_rx_tp > registry->napi_threshold)
@@ -422,7 +422,7 @@ void rtw_os_recv_indicate_pkt(_adapter *padapter, _pkt *pkt, union recv_frame *r
#endif
int ret;
- /* Indicat the packets to upper layer */
+ /* Indicate the packets to upper layer */
if (pkt) {
struct ethhdr *ehdr = (struct ethhdr *)pkt->data;
@@ -510,7 +510,7 @@ void rtw_os_recv_indicate_pkt(_adapter *padapter, _pkt *pkt, union recv_frame *r
#ifdef CONFIG_RTW_NAPI
#ifdef CONFIG_RTW_NAPI_DYNAMIC
if (!skb_queue_empty(&precvpriv->rx_napi_skb_queue)
- && !adapter_to_dvobj(padapter)->en_napi_dynamic
+ && !adapter_to_dvobj(padapter)->en_napi_dynamic
)
napi_recv(padapter, RTL_NAPI_WEIGHT);
#endif
@@ -604,13 +604,13 @@ void rtw_hostapd_mlme_rx(_adapter *padapter, union recv_frame *precv_frame)
skb->len = precv_frame->u.hdr.len;
/* pskb_copy = rtw_skb_copy(skb);
- * if(skb == NULL) goto _exit; */
+ if(skb == NULL) goto _exit; */
skb->dev = pmgnt_netdev;
skb->ip_summed = CHECKSUM_NONE;
skb->pkt_type = PACKET_OTHERHOST;
/* skb->protocol = __constant_htons(0x0019); ETH_P_80211_RAW */
- skb->protocol = __constant_htons(0x0003); /*ETH_P_80211_RAW*/
+ skb->protocol = htons(0x0003); /*ETH_P_80211_RAW*/
/* RTW_INFO("(1)data=0x%x, head=0x%x, tail=0x%x, mac_header=0x%x, len=%d\n", skb->data, skb->head, skb->tail, skb->mac_header, skb->len); */
diff --git a/os_dep/linux/usb_intf.c b/os_dep/linux/usb_intf.c
index 85e2373..e3c2632 100644
--- a/os_dep/linux/usb_intf.c
+++ b/os_dep/linux/usb_intf.c
@@ -12,6 +12,7 @@
* more details.
*
*****************************************************************************/
+
#define _HCI_INTF_C_
#include
@@ -65,12 +66,12 @@ static void rtw_dev_shutdown(struct device *dev)
#ifdef CONFIG_WOWLAN
#ifdef CONFIG_GPIO_WAKEUP
/*default wake up pin change to BT*/
- RTW_INFO("%s:default wake up pin change to BT\n", __FUNCTION__);
+ RTW_INFO("%s:default wake up pin change to BT\n", __func__);
rtw_hal_switch_gpio_wl_ctrl(adapter, WAKEUP_GPIO_IDX, _FALSE);
#endif /* CONFIG_GPIO_WAKEUP */
if (pwrctl->wowlan_mode == _TRUE)
- RTW_PRINT("%s wowlan_mode ==_TRUE do not run rtw_hal_deinit()\n", __FUNCTION__);
+ RTW_PRINT("%s wowlan_mode ==_TRUE do not run rtw_hal_deinit()\n", __func__);
else
#endif
{
@@ -875,7 +876,7 @@ int rtw_hw_suspend(_adapter *padapter)
return 0;
error_exit:
- RTW_INFO("%s, failed\n", __FUNCTION__);
+ RTW_INFO("%s, failed\n", __func__);
return -1;
}
@@ -910,7 +911,7 @@ int rtw_hw_resume(_adapter *padapter)
return 0;
error_exit:
- RTW_INFO("%s, Open net dev failed\n", __FUNCTION__);
+ RTW_INFO("%s, Open net dev failed\n", __func__);
return -1;
}
#endif
@@ -930,7 +931,7 @@ static int rtw_suspend(struct usb_interface *pusb_intf, pm_message_t message)
padapter = dvobj_get_primary_adapter(dvobj);
if (pwrpriv->bInSuspend == _TRUE) {
- RTW_INFO("%s bInSuspend = %d\n", __FUNCTION__, pwrpriv->bInSuspend);
+ RTW_INFO("%s bInSuspend = %d\n", __func__, pwrpriv->bInSuspend);
pdbgpriv->dbg_suspend_error_cnt++;
goto exit;
}
@@ -966,7 +967,7 @@ int rtw_resume_process(_adapter *padapter)
if (pwrpriv->bInSuspend == _FALSE) {
pdbgpriv->dbg_resume_error_cnt++;
- RTW_INFO("%s bInSuspend = %d\n", __FUNCTION__, pwrpriv->bInSuspend);
+ RTW_INFO("%s bInSuspend = %d\n", __func__, pwrpriv->bInSuspend);
return -1;
}
@@ -1043,7 +1044,7 @@ static int rtw_resume(struct usb_interface *pusb_intf)
padapter = dvobj_get_primary_adapter(dvobj);
pmlmeext = &padapter->mlmeextpriv;
- RTW_INFO("==> %s (%s:%d)\n", __FUNCTION__, current->comm, current->pid);
+ RTW_INFO("==> %s (%s:%d)\n", __func__, current->comm, current->pid);
pdbgpriv->dbg_resume_cnt++;
#ifdef CONFIG_AUTOSUSPEND
@@ -1073,7 +1074,7 @@ static int rtw_resume(struct usb_interface *pusb_intf)
}
pmlmeext->last_scan_time = rtw_get_current_time();
- RTW_INFO("<======== %s return %d\n", __FUNCTION__, ret);
+ RTW_INFO("<======== %s return %d\n", __func__, ret);
return ret;
}