From 2f77d6654b4bf3f926fd314347207705d3ac0932 Mon Sep 17 00:00:00 2001 From: Moritz Muehlenhoff Date: Sun, 25 Jan 2009 21:55:10 +0100 Subject: [PATCH] --- yaml --- r: 141178 b: refs/heads/master c: 3e7dbde92973b617a1e34b291ea93c3ef42af6cb h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/wlan-ng/p80211conv.h | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 9f9afe7a236b..5f9db77c1fdc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 944be922b7213fb844076051e99c2acae3c73676 +refs/heads/master: 3e7dbde92973b617a1e34b291ea93c3ef42af6cb diff --git a/trunk/drivers/staging/wlan-ng/p80211conv.h b/trunk/drivers/staging/wlan-ng/p80211conv.h index 8dd9f883b407..acba7c669a6e 100644 --- a/trunk/drivers/staging/wlan-ng/p80211conv.h +++ b/trunk/drivers/staging/wlan-ng/p80211conv.h @@ -60,11 +60,8 @@ #define WLAN_IEEE_OUI_LEN 3 #define WLAN_ETHCONV_ENCAP 1 -#define WLAN_ETHCONV_RFC1042 2 #define WLAN_ETHCONV_8021h 3 -#define WLAN_MIN_ETHFRM_LEN 60 -#define WLAN_MAX_ETHFRM_LEN 1514 #define WLAN_ETHHDR_LEN 14 #define P80211CAPTURE_VERSION 0x80211001 @@ -178,6 +175,5 @@ int skb_ether_to_p80211( struct wlandevice *wlandev, u32 ethconv, p80211_metawep_t *p80211_wep ); int p80211_stt_findproto(u16 proto); -int p80211_stt_addproto(u16 proto); #endif