staging: rtl8723au: Simplify retrieving the ether_type in portctrl()
authorJes Sorensen <Jes.Sorensen@redhat.com>
Wed, 9 Apr 2014 21:21:23 +0000 (23:21 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 14 Apr 2014 15:29:24 +0000 (08:29 -0700)
This renders the last element in include/ethernet.h unnecessary, so
remove it as well.

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8723au/core/rtw_mlme_ext.c
drivers/staging/rtl8723au/core/rtw_recv.c
drivers/staging/rtl8723au/hal/rtl8723au_recv.c
drivers/staging/rtl8723au/include/ethernet.h [deleted file]
drivers/staging/rtl8723au/os_dep/os_intfs.c
drivers/staging/rtl8723au/os_dep/recv_linux.c

index ae6ef6532af0832381c07544b3a7003950e0721f..be593989aec751ba5d898b396ba5d986f1a3cc5c 100644 (file)
@@ -21,7 +21,6 @@
 #include <wlan_bssdef.h>
 #include <mlme_osdep.h>
 #include <recv_osdep.h>
-#include <ethernet.h>
 #include <linux/ieee80211.h>
 
 #ifdef CONFIG_8723AU_BT_COEXIST
index 5292bc2fd29a82ec039fda4349424a64162cfe34..713a377ce28f976e89cc857690c5b30079553198 100644 (file)
@@ -19,7 +19,6 @@
 #include <mlme_osdep.h>
 #include <linux/ip.h>
 #include <linux/if_ether.h>
-#include <ethernet.h>
 #include <usb_ops.h>
 #include <linux/ieee80211.h>
 #include <wifi.h>
@@ -583,7 +582,6 @@ static struct recv_frame *portctrl(struct rtw_adapter *adapter,
 
        auth_alg = adapter->securitypriv.dot11AuthAlgrthm;
 
-       ptr = precv_frame->pkt->data;
        pfhdr = precv_frame;
        pattrib = &pfhdr->attrib;
        psta_addr = pattrib->ta;
@@ -595,9 +593,9 @@ static struct recv_frame *portctrl(struct rtw_adapter *adapter,
 
        if (auth_alg == dot11AuthAlgrthm_8021X) {
                /* get ether_type */
-               ptr = ptr + pfhdr->attrib.hdrlen + LLC_HEADER_SIZE;
-               memcpy(&ether_type, ptr, 2);
-               ether_type = ntohs((unsigned short)ether_type);
+               ptr = pfhdr->pkt->data + pfhdr->attrib.hdrlen;
+
+               ether_type = (ptr[6] << 8) | ptr[7];
 
                if ((psta != NULL) && (psta->ieee8021x_blocked)) {
                        /* blocked */
index 213d1936109d019e0b6f9c936f4ec8b3509625dd..a7568bb65e2a367ce0ed985f3b6c3e84626eec36 100644 (file)
@@ -19,7 +19,6 @@
 #include <mlme_osdep.h>
 #include <linux/ip.h>
 #include <linux/if_ether.h>
-#include <ethernet.h>
 #include <usb_ops.h>
 #include <wifi.h>
 #include <rtl8723a_hal.h>
diff --git a/drivers/staging/rtl8723au/include/ethernet.h b/drivers/staging/rtl8723au/include/ethernet.h
deleted file mode 100644 (file)
index 39fc6df..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-/******************************************************************************
- *
- * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- *
- ******************************************************************************/
-/*! \file */
-#ifndef __INC_ETHERNET_H
-#define __INC_ETHERNET_H
-
-#define LLC_HEADER_SIZE                        6       /*  LLC Header Length */
-
-#endif /*  #ifndef __INC_ETHERNET_H */
index eab40d21fb3dbaf840704171677da2966c881d77..7c7c2c93e413e2bef934950c90782fbddbb4bf9b 100644 (file)
@@ -20,7 +20,6 @@
 #include <recv_osdep.h>
 #include <hal_intf.h>
 #include <rtw_version.h>
-#include <ethernet.h>
 
 #include <usb_osintf.h>
 #include <linux/version.h>
index 84402a589f258ae56045555aebda6f30d778f5d4..18572090ac480982200dda33c336814a7b60b8ed 100644 (file)
@@ -21,7 +21,6 @@
 #include <recv_osdep.h>
 
 #include <osdep_intf.h>
-#include <ethernet.h>
 
 #include <usb_ops.h>