Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

[~andy/linux] / drivers / staging / rtl8712 / rtl8712_recv.c

diff --git a/drivers/staging/rtl8712/rtl8712_recv.c b/drivers/staging/rtl8712/rtl8712_recv.c
index fa6dc9c09b3fbee0b4451f24f0ac9c3afb3bc5dc..8e82ce2fee38dfadc288e6d9b0cad5501e2bd46c 100644 (file)
--- a/drivers/staging/rtl8712/rtl8712_recv.c
+++ b/drivers/staging/rtl8712/rtl8712_recv.c
@@ -28,12 +28,13 @@
 
 #define _RTL8712_RECV_C_
 
+#include <linux/if_ether.h>
+#include <linux/ip.h>
+
 #include "osdep_service.h"
 #include "drv_types.h"
 #include "recv_osdep.h"
 #include "mlme_osdep.h"
-#include "ip.h"
-#include "if_ether.h"
 #include "ethernet.h"
 #include "usb_ops.h"
 #include "wifi.h"
@@ -459,7 +460,7 @@ void r8712_rxcmd_event_hdl(struct _adapter *padapter, void *prxcmdbuf)
                cmd_seq = (u8)((le32_to_cpu(voffset) >> 24) & 0x7f);
                eid = (u8)((le32_to_cpu(voffset) >> 16) & 0xff);
                r8712_event_handle(padapter, (uint *)poffset);
-               poffset += (cmd_len + 8);/*8 bytes aligment*/
+               poffset += (cmd_len + 8);/*8 bytes alignment*/
        } while (le32_to_cpu(voffset) & BIT(31));
 
 }
@@ -603,7 +604,7 @@ static int recv_indicatepkt_reorder(struct _adapter *padapter,
                }
        }
        spin_lock_irqsave(&ppending_recvframe_queue->lock, irql);
-       /*s2. check if winstart_b(indicate_seq) needs to been updated*/
+       /*s2. check if winstart_b(indicate_seq) needs to be updated*/
        if (!check_indicate_seq(preorder_ctrl, pattrib->seq_num))
                goto _err_exit;
        /*s3. Insert all packet into Reorder Queue to maintain its ordering.*/