aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--drivers/staging/rtl8712/if_ether.h141
-rw-r--r--drivers/staging/rtl8712/rtl8712_recv.c3
-rw-r--r--drivers/staging/rtl8712/rtl871x_recv.c2
-rw-r--r--drivers/staging/rtl8712/xmit_linux.c2
4 files changed, 4 insertions, 144 deletions
diff --git a/drivers/staging/rtl8712/if_ether.h b/drivers/staging/rtl8712/if_ether.h
deleted file mode 100644
index 9916b6a2b73a..000000000000
--- a/drivers/staging/rtl8712/if_ether.h
+++ /dev/null
@@ -1,141 +0,0 @@
1/******************************************************************************
2 *
3 * Copyright(c) 2007 - 2010 Realtek Corporation. All rights reserved.
4 *
5 * This program is free software; you can redistribute it and/or modify it
6 * under the terms of version 2 of the GNU General Public License as
7 * published by the Free Software Foundation.
8 *
9 * This program is distributed in the hope that it will be useful, but WITHOUT
10 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
11 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
12 * more details.
13 *
14 * You should have received a copy of the GNU General Public License along with
15 * this program; if not, write to the Free Software Foundation, Inc.,
16 * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
17 *
18 * Modifications for inclusion into the Linux staging tree are
19 * Copyright(c) 2010 Larry Finger. All rights reserved.
20 *
21 * Contact information:
22 * WLAN FAE <wlanfae@realtek.com>
23 * Larry Finger <Larry.Finger@lwfinger.net>
24 *
25 ******************************************************************************/
26/*
27 * INET An implementation of the TCP/IP protocol suite for the LINUX
28 * operating system. INET is implemented using the BSD Socket
29 * interface as the means of communication with the user level.
30 *
31 * Global definitions for the Ethernet IEEE 802.3 interface.
32 *
33 * Version: @(#)if_ether.h 1.0.1a 02/08/94
34 *
35 * Author: Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
36 * Donald Becker, <becker@super.org>
37 * Alan Cox, <alan@redhat.com>
38 * Steve Whitehouse, <gw7rrm@eeshack3.swan.ac.uk>
39 *
40 * This program is free software; you can redistribute it and/or
41 * modify it under the terms of the GNU General Public License
42 * as published by the Free Software Foundation; either version
43 * 2 of the License, or (at your option) any later version.
44 */
45
46#ifndef _LINUX_IF_ETHER_H
47#define _LINUX_IF_ETHER_H
48
49/*
50 * IEEE 802.3 Ethernet magic constants. The frame sizes omit the preamble
51 * and FCS/CRC (frame check sequence).
52 */
53
54#define ETH_ALEN 6 /* Octets in one ethernet addr */
55#define ETH_HLEN 14 /* Total octets in header. */
56#define ETH_ZLEN 60 /* Min. octets in frame sans FCS */
57#define ETH_DATA_LEN 1500 /* Max. octets in payload */
58#define ETH_FRAME_LEN 1514 /* Max. octets in frame sans FCS */
59
60/*
61 * These are the defined Ethernet Protocol ID's.
62 */
63
64#define ETH_P_LOOP 0x0060 /* Ethernet Loopback packet */
65#define ETH_P_PUP 0x0200 /* Xerox PUP packet */
66#define ETH_P_PUPAT 0x0201 /* Xerox PUP Addr Trans packet */
67#define ETH_P_IP 0x0800 /* Internet Protocol packet */
68#define ETH_P_X25 0x0805 /* CCITT X.25 */
69#define ETH_P_ARP 0x0806 /* Address Resolution packet */
70#define ETH_P_BPQ 0x08FF /* G8BPQ AX.25 Ethernet Packet
71 * [ NOT AN OFFICIAL ID ] */
72#define ETH_P_IEEEPUP 0x0a00 /* Xerox IEEE802.3 PUP packet */
73#define ETH_P_IEEEPUPAT 0x0a01 /* Xerox IEEE802.3 PUP Addr
74 * Trans packet */
75#define ETH_P_DEC 0x6000 /* DEC Assigned proto */
76#define ETH_P_DNA_DL 0x6001 /* DEC DNA Dump/Load */
77#define ETH_P_DNA_RC 0x6002 /* DEC DNA Remote Console */
78#define ETH_P_DNA_RT 0x6003 /* DEC DNA Routing */
79#define ETH_P_LAT 0x6004 /* DEC LAT */
80#define ETH_P_DIAG 0x6005 /* DEC Diagnostics */
81#define ETH_P_CUST 0x6006 /* DEC Customer use */
82#define ETH_P_SCA 0x6007 /* DEC Systems Comms Arch */
83#define ETH_P_RARP 0x8035 /* Reverse Addr Res packet */
84#define ETH_P_ATALK 0x809B /* Appletalk DDP */
85#define ETH_P_AARP 0x80F3 /* Appletalk AARP */
86#define ETH_P_8021Q 0x8100 /* 802.1Q VLAN Extended Header */
87#define ETH_P_IPX 0x8137 /* IPX over DIX */
88#define ETH_P_IPV6 0x86DD /* IPv6 over bluebook */
89#define ETH_P_PPP_DISC 0x8863 /* PPPoE discovery messages */
90#define ETH_P_PPP_SES 0x8864 /* PPPoE session messages */
91#define ETH_P_ATMMPOA 0x884c /* MultiProtocol Over ATM */
92#define ETH_P_ATMFATE 0x8884 /* Frame-based ATM Transport
93 * over Ethernet
94 */
95
96/*
97 * Non DIX types. Won't clash for 1500 types.
98 */
99
100#define ETH_P_802_3 0x0001 /* Dummy type for 802.3 frames */
101#define ETH_P_AX25 0x0002 /* Dummy protocol id for AX.25 */
102#define ETH_P_ALL 0x0003 /* Every packet (be careful!!!) */
103#define ETH_P_802_2 0x0004 /* 802.2 frames */
104#define ETH_P_SNAP 0x0005 /* Internal only */
105#define ETH_P_DDCMP 0x0006 /* DEC DDCMP: Internal only */
106#define ETH_P_WAN_PPP 0x0007 /* Dummy type for WAN PPP frames*/
107#define ETH_P_PPP_MP 0x0008 /* Dummy type for PPP MP frames */
108#define ETH_P_LOCALTALK 0x0009 /* Localtalk pseudo type */
109#define ETH_P_PPPTALK 0x0010 /* Dummy type for Atalk over PPP*/
110#define ETH_P_TR_802_2 0x0011i /* 802.2 frames */
111#define ETH_P_MOBITEX 0x0015 /* Mobitex (kaz@cafe.net) */
112#define ETH_P_CONTROL 0x0016 /* Card specific control frames */
113#define ETH_P_IRDA 0x0017 /* Linux-IrDA */
114#define ETH_P_ECONET 0x0018 /* Acorn Econet */
115
116/*
117 * This is an Ethernet frame header.
118 */
119
120struct ethhdr {
121 unsigned char h_dest[ETH_ALEN]; /* destination eth addr */
122 unsigned char h_source[ETH_ALEN]; /* source ether addr */
123 unsigned short h_proto; /* packet type ID field */
124};
125
126struct _vlan {
127 unsigned short h_vlan_TCI; /* Encapsulates priority and VLAN ID*/
128 unsigned short h_vlan_encapsulated_proto;
129};
130
131
132
133#define get_vlan_id(pvlan) ((ntohs((unsigned short)pvlan->h_vlan_TCI)) & 0xfff)
134#define get_vlan_priority(pvlan) ((ntohs((unsigned short)\
135 pvlan->h_vlan_TCI)) >> 13)
136#define get_vlan_encap_proto(pvlan) (ntohs((unsigned short)\
137 pvlan->h_vlan_encapsulated_proto))
138
139
140#endif /* _LINUX_IF_ETHER_H */
141
diff --git a/drivers/staging/rtl8712/rtl8712_recv.c b/drivers/staging/rtl8712/rtl8712_recv.c
index 5d7217fa80da..3eaaf31daebc 100644
--- a/drivers/staging/rtl8712/rtl8712_recv.c
+++ b/drivers/staging/rtl8712/rtl8712_recv.c
@@ -28,12 +28,13 @@
28 28
29#define _RTL8712_RECV_C_ 29#define _RTL8712_RECV_C_
30 30
31#include <linux/if_ether.h>
32
31#include "osdep_service.h" 33#include "osdep_service.h"
32#include "drv_types.h" 34#include "drv_types.h"
33#include "recv_osdep.h" 35#include "recv_osdep.h"
34#include "mlme_osdep.h" 36#include "mlme_osdep.h"
35#include "ip.h" 37#include "ip.h"
36#include "if_ether.h"
37#include "ethernet.h" 38#include "ethernet.h"
38#include "usb_ops.h" 39#include "usb_ops.h"
39#include "wifi.h" 40#include "wifi.h"
diff --git a/drivers/staging/rtl8712/rtl871x_recv.c b/drivers/staging/rtl8712/rtl871x_recv.c
index 5b03b405883e..7376abbdea75 100644
--- a/drivers/staging/rtl8712/rtl871x_recv.c
+++ b/drivers/staging/rtl8712/rtl871x_recv.c
@@ -29,6 +29,7 @@
29#define _RTL871X_RECV_C_ 29#define _RTL871X_RECV_C_
30 30
31#include <linux/slab.h> 31#include <linux/slab.h>
32#include <linux/if_ether.h>
32#include <linux/kmemleak.h> 33#include <linux/kmemleak.h>
33 34
34#include "osdep_service.h" 35#include "osdep_service.h"
@@ -36,7 +37,6 @@
36#include "recv_osdep.h" 37#include "recv_osdep.h"
37#include "mlme_osdep.h" 38#include "mlme_osdep.h"
38#include "ip.h" 39#include "ip.h"
39#include "if_ether.h"
40#include "ethernet.h" 40#include "ethernet.h"
41#include "usb_ops.h" 41#include "usb_ops.h"
42#include "wifi.h" 42#include "wifi.h"
diff --git a/drivers/staging/rtl8712/xmit_linux.c b/drivers/staging/rtl8712/xmit_linux.c
index c9703627c8f5..d27f652127b1 100644
--- a/drivers/staging/rtl8712/xmit_linux.c
+++ b/drivers/staging/rtl8712/xmit_linux.c
@@ -29,12 +29,12 @@
29#define _XMIT_OSDEP_C_ 29#define _XMIT_OSDEP_C_
30 30
31#include <linux/usb.h> 31#include <linux/usb.h>
32#include <linux/if_ether.h>
32 33
33#include "osdep_service.h" 34#include "osdep_service.h"
34#include "drv_types.h" 35#include "drv_types.h"
35 36
36 37
37#include "if_ether.h"
38#include "ip.h" 38#include "ip.h"
39#include "rtl871x_byteorder.h" 39#include "rtl871x_byteorder.h"
40#include "wifi.h" 40#include "wifi.h"
generated by cgit v1.2.2 (git 2.25.0) at 2025-02-27 15:39:13 -0500