Merge remote-tracking branch 'staging/staging-next'

[deliverable/linux.git] / drivers / staging / rtl8188eu / hal / rtl8188e_cmd.c

diff --git a/drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c b/drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c
index 2422c0297a50bcb4bd8e34703a53569556f67221..18f69b83506f4ee0c7a32a63a89ee4bbe7144d3b 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c
+++ b/drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c
@@ -126,7 +126,7 @@ exit:
 /* bitmap[28:31]= Rate Adaptive id */
 /* arg[0:4] = macid */
 /* arg[5] = Short GI */
-void rtl8188e_Add_RateATid(struct adapter *pAdapter, u32 bitmap, u8 arg, u8 rssi_level)
+void rtw_hal_add_ra_tid(struct adapter *pAdapter, u32 bitmap, u8 arg, u8 rssi_level)
 {
        struct hal_data_8188e *haldata = GET_HAL_DATA(pAdapter);
 
@@ -219,7 +219,7 @@ void rtl8188e_set_FwMediaStatus_cmd(struct adapter *adapt, __le16 mstatus_rpt)
 
 static void ConstructBeacon(struct adapter *adapt, u8 *pframe, u32 *pLength)
 {
-       struct rtw_ieee80211_hdr        *pwlanhdr;
+       struct ieee80211_hdr *pwlanhdr;
        __le16 *fctrl;
        u32 rate_len, pktlen;
        struct mlme_ext_priv *pmlmeext = &(adapt->mlmeextpriv);
@@ -227,9 +227,9 @@ static void ConstructBeacon(struct adapter *adapt, u8 *pframe, u32 *pLength)
        struct wlan_bssid_ex            *cur_network = &(pmlmeinfo->network);
        u8 bc_addr[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
 
-       pwlanhdr = (struct rtw_ieee80211_hdr *)pframe;
+       pwlanhdr = (struct ieee80211_hdr *)pframe;
 
-       fctrl = &(pwlanhdr->frame_ctl);
+       fctrl = &pwlanhdr->frame_control;
        *(fctrl) = 0;
 
        memcpy(pwlanhdr->addr1, bc_addr, ETH_ALEN);
@@ -239,8 +239,8 @@ static void ConstructBeacon(struct adapter *adapt, u8 *pframe, u32 *pLength)
        SetSeqNum(pwlanhdr, 0/*pmlmeext->mgnt_seq*/);
        SetFrameSubType(pframe, WIFI_BEACON);
 
-       pframe += sizeof(struct rtw_ieee80211_hdr_3addr);
-       pktlen = sizeof(struct rtw_ieee80211_hdr_3addr);
+       pframe += sizeof(struct ieee80211_hdr_3addr);
+       pktlen = sizeof(struct ieee80211_hdr_3addr);
 
        /* timestamp will be inserted by hardware */
        pframe += 8;
@@ -304,16 +304,16 @@ _ConstructBeacon:
 
 static void ConstructPSPoll(struct adapter *adapt, u8 *pframe, u32 *pLength)
 {
-       struct rtw_ieee80211_hdr        *pwlanhdr;
+       struct ieee80211_hdr *pwlanhdr;
        struct mlme_ext_priv *pmlmeext = &(adapt->mlmeextpriv);
        struct mlme_ext_info    *pmlmeinfo = &(pmlmeext->mlmext_info);
        __le16 *fctrl;
        struct wlan_bssid_ex *pnetwork = &(pmlmeinfo->network);
 
-       pwlanhdr = (struct rtw_ieee80211_hdr *)pframe;
+       pwlanhdr = (struct ieee80211_hdr *)pframe;
 
        /*  Frame control. */
-       fctrl = &(pwlanhdr->frame_ctl);
+       fctrl = &pwlanhdr->frame_control;
        *(fctrl) = 0;
        SetPwrMgt(fctrl);
        SetFrameSubType(pframe, WIFI_PSPOLL);
@@ -338,7 +338,7 @@ static void ConstructNullFunctionData(struct adapter *adapt, u8 *pframe,
        u8 bEosp,
        u8 bForcePowerSave)
 {
-       struct rtw_ieee80211_hdr        *pwlanhdr;
+       struct ieee80211_hdr *pwlanhdr;
        __le16 *fctrl;
        u32 pktlen;
        struct mlme_priv *pmlmepriv = &adapt->mlmepriv;
@@ -347,9 +347,9 @@ static void ConstructNullFunctionData(struct adapter *adapt, u8 *pframe,
        struct mlme_ext_info    *pmlmeinfo = &(pmlmeext->mlmext_info);
        struct wlan_bssid_ex *pnetwork = &(pmlmeinfo->network);
 
-       pwlanhdr = (struct rtw_ieee80211_hdr *)pframe;
+       pwlanhdr = (struct ieee80211_hdr *)pframe;
 
-       fctrl = &pwlanhdr->frame_ctl;
+       fctrl = &pwlanhdr->frame_control;
        *(fctrl) = 0;
        if (bForcePowerSave)
                SetPwrMgt(fctrl);
@@ -378,19 +378,19 @@ static void ConstructNullFunctionData(struct adapter *adapt, u8 *pframe,
        SetSeqNum(pwlanhdr, 0);
 
        if (bQoS) {
-               struct rtw_ieee80211_hdr_3addr_qos *pwlanqoshdr;
+               struct ieee80211_qos_hdr *pwlanqoshdr;
 
                SetFrameSubType(pframe, WIFI_QOS_DATA_NULL);
 
-               pwlanqoshdr = (struct rtw_ieee80211_hdr_3addr_qos *)pframe;
-               SetPriority(&pwlanqoshdr->qc, AC);
-               SetEOSP(&pwlanqoshdr->qc, bEosp);
+               pwlanqoshdr = (struct ieee80211_qos_hdr *)pframe;
+               SetPriority(&pwlanqoshdr->qos_ctrl, AC);
+               SetEOSP(&pwlanqoshdr->qos_ctrl, bEosp);
 
-               pktlen = sizeof(struct rtw_ieee80211_hdr_3addr_qos);
+               pktlen = sizeof(struct ieee80211_qos_hdr);
        } else {
                SetFrameSubType(pframe, WIFI_DATA_NULL);
 
-               pktlen = sizeof(struct rtw_ieee80211_hdr_3addr);
+               pktlen = sizeof(struct ieee80211_hdr_3addr);
        }
 
        *pLength = pktlen;
@@ -398,7 +398,7 @@ static void ConstructNullFunctionData(struct adapter *adapt, u8 *pframe,
 
 static void ConstructProbeRsp(struct adapter *adapt, u8 *pframe, u32 *pLength, u8 *StaAddr, bool bHideSSID)
 {
-       struct rtw_ieee80211_hdr        *pwlanhdr;
+       struct ieee80211_hdr *pwlanhdr;
        __le16 *fctrl;
        u8 *mac, *bssid;
        u32 pktlen;
@@ -406,12 +406,12 @@ static void ConstructProbeRsp(struct adapter *adapt, u8 *pframe, u32 *pLength, u
        struct mlme_ext_info    *pmlmeinfo = &(pmlmeext->mlmext_info);
        struct wlan_bssid_ex    *cur_network = &(pmlmeinfo->network);
 
-       pwlanhdr = (struct rtw_ieee80211_hdr *)pframe;
+       pwlanhdr = (struct ieee80211_hdr *)pframe;
 
        mac = myid(&(adapt->eeprompriv));
        bssid = cur_network->MacAddress;
 
-       fctrl = &(pwlanhdr->frame_ctl);
+       fctrl = &pwlanhdr->frame_control;
        *(fctrl) = 0;
        memcpy(pwlanhdr->addr1, StaAddr, ETH_ALEN);
        memcpy(pwlanhdr->addr2, mac, ETH_ALEN);
@@ -420,7 +420,7 @@ static void ConstructProbeRsp(struct adapter *adapt, u8 *pframe, u32 *pLength, u
        SetSeqNum(pwlanhdr, 0);
        SetFrameSubType(fctrl, WIFI_PROBERSP);
 
-       pktlen = sizeof(struct rtw_ieee80211_hdr_3addr);
+       pktlen = sizeof(struct ieee80211_hdr_3addr);
        pframe += pktlen;
 
        if (cur_network->IELength > MAX_IE_SZ)