summaryrefslogtreecommitdiffstats
path: root/drivers/staging/wlan-ng/p80211conv.h
diff options
context:
space:
mode:
authorAnish Bhatt2015-09-04 23:00:30 +0200
committerGreg Kroah-Hartman2015-09-13 03:24:52 +0200
commit242850f48a96ce0bf48e81fa20850792f27fd3ba (patch)
tree3aa951de95465bdbc63c4c8baafa56ae623e5560 /drivers/staging/wlan-ng/p80211conv.h
parentStaging: fsl-mc/bus: mc-bus.c: Fixed coding style issues (diff)
downloadkernel-qcow2-linux-242850f48a96ce0bf48e81fa20850792f27fd3ba.tar.gz
kernel-qcow2-linux-242850f48a96ce0bf48e81fa20850792f27fd3ba.tar.xz
kernel-qcow2-linux-242850f48a96ce0bf48e81fa20850792f27fd3ba.zip
staging/wlan-ng : Remove duplicated defines from p80211
ETH_ALEN/ETH_HLEN can be used instead of WLAN_ETHADDR_LEN & WLAN_ETHHDR_LEN, replace directly or use eth_addr* functions where applicable. Signed-off-by: Anish Bhatt <anish@chelsio.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/wlan-ng/p80211conv.h')
-rw-r--r--drivers/staging/wlan-ng/p80211conv.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/staging/wlan-ng/p80211conv.h b/drivers/staging/wlan-ng/p80211conv.h
index e031a74d2ad4..8c10357bedf0 100644
--- a/drivers/staging/wlan-ng/p80211conv.h
+++ b/drivers/staging/wlan-ng/p80211conv.h
@@ -53,14 +53,11 @@
#ifndef _LINUX_P80211CONV_H
#define _LINUX_P80211CONV_H
-#define WLAN_ETHADDR_LEN 6
#define WLAN_IEEE_OUI_LEN 3
#define WLAN_ETHCONV_ENCAP 1
#define WLAN_ETHCONV_8021h 3
-#define WLAN_ETHHDR_LEN 14
-
#define P80211CAPTURE_VERSION 0x80211001
#define P80211_FRMMETA_MAGIC 0x802110
@@ -131,8 +128,8 @@ struct p80211_metawep {
/* local ether header type */
struct wlan_ethhdr {
- u8 daddr[WLAN_ETHADDR_LEN];
- u8 saddr[WLAN_ETHADDR_LEN];
+ u8 daddr[ETH_ALEN];
+ u8 saddr[ETH_ALEN];
u16 type;
} __packed;