openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: rtl8723au: Simplify retrieving the ether_type in portctrl() 

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>
This commit is contained in:
Jes Sorensen 2014-04-09 23:21:23 +02:00 committed by Greg Kroah-Hartman
parent 7d0d2b15a0
commit 94b080bc70
6 changed files with 3 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/staging/rtl8723au/core/rtw_mlme_ext.c
View 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

8
drivers/staging/rtl8723au/core/rtw_recv.c
View 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 */

1
drivers/staging/rtl8723au/hal/rtl8723au_recv.c
View 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>

22
drivers/staging/rtl8723au/include/ethernet.h
View File

@ -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 */

1
drivers/staging/rtl8723au/os_dep/os_intfs.c
View 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>

1
drivers/staging/rtl8723au/os_dep/recv_linux.c
View File

@ -21,7 +21,6 @@
#include <recv_osdep.h>
#include <osdep_intf.h>
#include <ethernet.h>
#include <usb_ops.h>