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 1c2014fd8d812ab85c9ae9edf0451665618e9e3c..cf11b042b93a55754b66bc64c65401543f37ab79 100644 (file)
--- a/drivers/staging/rtl8192e/rtllib_rx.c
+++ b/drivers/staging/rtl8192e/rtllib_rx.c
@@ -1415,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--
@@ -2691,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) &&