Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux

[firefly-linux-kernel-4.4.55.git] / drivers / staging / rtl8192e / rtllib_rx.c

diff --git a/drivers/staging/rtl8192e/rtllib_rx.c b/drivers/staging/rtl8192e/rtllib_rx.c
index 7db3e7445428a528f805dfd079eb0362286731cf..cf11b042b93a55754b66bc64c65401543f37ab79 100644 (file)
--- a/drivers/staging/rtl8192e/rtllib_rx.c
+++ b/drivers/staging/rtl8192e/rtllib_rx.c
@@ -52,7 +52,7 @@ static inline void rtllib_monitor_rx(struct rtllib_device *ieee,
        skb_reset_mac_header(skb);
        skb_pull(skb, hdr_length);
        skb->pkt_type = PACKET_OTHERHOST;
-       skb->protocol = __constant_htons(ETH_P_80211_RAW);
+       skb->protocol = htons(ETH_P_80211_RAW);
        memset(skb->cb, 0, sizeof(skb->cb));
        netif_rx(skb);
 }
@@ -290,6 +290,7 @@ rtllib_rx_frame_decrypt(struct rtllib_device *ieee, struct sk_buff *skb,
 
        if (ieee->hwsec_active) {
                struct cb_desc *tcb_desc = (struct cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE);
+
                tcb_desc->bHwSec = 1;
 
                if (ieee->need_sw_enc)
@@ -330,6 +331,7 @@ rtllib_rx_frame_decrypt_msdu(struct rtllib_device *ieee, struct sk_buff *skb,
                return 0;
        if (ieee->hwsec_active) {
                struct cb_desc *tcb_desc = (struct cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE);
+
                tcb_desc->bHwSec = 1;
 
                if (ieee->need_sw_enc)
@@ -389,6 +391,7 @@ static int is_duplicate_packet(struct rtllib_device *ieee,
                struct ieee_ibss_seq *entry = NULL;
                u8 *mac = header->addr2;
                int index = mac[5] % IEEE_IBSS_MAC_HASH_SIZE;
+
                list_for_each(p, &ieee->ibss_mac_hash[index]) {
                        entry = list_entry(p, struct ieee_ibss_seq, list);
                        if (!memcmp(entry->mac, mac, ETH_ALEN))
@@ -471,8 +474,10 @@ void rtllib_indicate_packets(struct rtllib_device *ieee, struct rtllib_rxb **prx
        struct net_device_stats *stats = &ieee->stats;
        u8 i = 0 , j = 0;
        u16 ethertype;
+
        for (j = 0; j < index; j++) {
                struct rtllib_rxb *prxb = prxbIndicateArray[j];
+
                for (i = 0; i < prxb->nr_subframes; i++) {
                        struct sk_buff *sub_skb = prxb->subframes[i];
 
@@ -572,6 +577,7 @@ static void RxReorderIndicatePacket(struct rtllib_device *ieee,
                pHTInfo->RxReorderDropCounter++;
                {
                        int i;
+
                        for (i = 0; i < prxb->nr_subframes; i++)
                                dev_kfree_skb(prxb->subframes[i]);
                        kfree(prxb);
@@ -638,6 +644,7 @@ static void RxReorderIndicatePacket(struct rtllib_device *ieee,
                                list_add_tail(&pReorderEntry->List,
                                              &ieee->RxReorder_Unused_List); {
                                        int i;
+
                                        for (i = 0; i < prxb->nr_subframes; i++)
                                                dev_kfree_skb(prxb->subframes[i]);
                                        kfree(prxb);
@@ -661,6 +668,7 @@ static void RxReorderIndicatePacket(struct rtllib_device *ieee,
                                     "dropped!!\n");
                        {
                                int i;
+
                                for (i = 0; i < prxb->nr_subframes; i++)
                                        dev_kfree_skb(prxb->subframes[i]);
                                kfree(prxb);
@@ -905,15 +913,14 @@ static int rtllib_rx_check_duplicate(struct rtllib_device *ieee,
                }
        } else {
                struct rx_ts_record *pRxTS = NULL;
+
                if (GetTs(ieee, (struct ts_common_info **) &pRxTS, hdr->addr2,
                        (u8)Frame_QoSTID((u8 *)(skb->data)), RX_DIR, true)) {
                        if ((fc & (1<<11)) && (frag == pRxTS->RxLastFragNum) &&
-                           (WLAN_GET_SEQ_SEQ(sc) == pRxTS->RxLastSeqNum)) {
+                           (WLAN_GET_SEQ_SEQ(sc) == pRxTS->RxLastSeqNum))
                                return -1;
-                       } else {
-                               pRxTS->RxLastFragNum = frag;
-                               pRxTS->RxLastSeqNum = WLAN_GET_SEQ_SEQ(sc);
-                       }
+                       pRxTS->RxLastFragNum = frag;
+                       pRxTS->RxLastSeqNum = WLAN_GET_SEQ_SEQ(sc);
                } else {
                        RTLLIB_DEBUG(RTLLIB_DL_ERR, "ERR!!%s(): No TS!! Skip"
                                     " the check!!\n", __func__);
@@ -1074,6 +1081,7 @@ static int rtllib_rx_decrypt(struct rtllib_device *ieee, struct sk_buff *skb,
        if ((frag != 0 || (fc & RTLLIB_FCTL_MOREFRAGS))) {
                int flen;
                struct sk_buff *frag_skb = rtllib_frag_cache_get(ieee, hdr);
+
                RTLLIB_DEBUG_FRAG("Rx Fragment received (%u)\n", frag);
 
                if (!frag_skb) {
@@ -1407,10 +1415,6 @@ static int rtllib_rx_InfraAdhoc(struct rtllib_device *ieee, struct sk_buff *skb,
        return 1;
 
  rx_dropped:
-       if (rxb != NULL) {
-               kfree(rxb);
-               rxb = NULL;
-       }
        ieee->stats.rx_dropped++;
 
        /* Returning 0 indicates to caller that we have not handled the SKB--
@@ -2683,7 +2687,7 @@ void rtllib_rx_mgt(struct rtllib_device *ieee,
                      struct sk_buff *skb,
                      struct rtllib_rx_stats *stats)
 {
-       struct rtllib_hdr_4addr *header = (struct rtllib_hdr_4addr *)skb->data ;
+       struct rtllib_hdr_4addr *header = (struct rtllib_hdr_4addr *)skb->data;
 
        if ((WLAN_FC_GET_STYPE(le16_to_cpu(header->frame_ctl)) !=
            RTLLIB_STYPE_PROBE_RESP) &&