SOURCES (LINUX_2_6): kernel-ieee80211-1.2.15.patch (NEW) - [PL] na...

cieciwa cieciwa at pld-linux.org
Thu Sep 14 14:52:41 CEST 2006


Author: cieciwa                      Date: Thu Sep 14 12:52:40 2006 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- [PL] nagłówki z ieee80211-1.2.15 to testowego budowania kernela.

---- Files affected:
SOURCES:
   kernel-ieee80211-1.2.15.patch (NONE -> 1.1.2.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/kernel-ieee80211-1.2.15.patch
diff -u /dev/null SOURCES/kernel-ieee80211-1.2.15.patch:1.1.2.1
--- /dev/null	Thu Sep 14 14:52:40 2006
+++ SOURCES/kernel-ieee80211-1.2.15.patch	Thu Sep 14 14:52:35 2006
@@ -0,0 +1,104 @@
+--- linux-2.6.17/include/net/ieee80211.h.org	2006-06-18 03:49:35.000000000 +0200
++++ linux-2.6.17/include/net/ieee80211.h	2006-08-18 05:25:46.000000000 +0200
+@@ -29,7 +29,17 @@
+ #include <linux/kernel.h>	/* ARRAY_SIZE */
+ #include <linux/wireless.h>
+ 
+-#define IEEE80211_VERSION "git-1.1.7"
++#define IEEE80211_VERSION_MAJOR 1
++#define IEEE80211_VERSION_API 2
++#define IEEE80211_VERSION_MINOR 15
++#define IEEE80211_VERSION_CODE IEEE80211_VERSION_MAJOR * 65536 + \
++			       IEEE80211_VERSION_API * 256 + \
++			       IEEE80211_VERSION_MINOR
++#define _STRX(x) #x
++#define _VERSION_STR(a,b,c) _STRX(a) "." _STRX(b) "." _STRX(c)
++#define IEEE80211_VERSION _VERSION_STR(IEEE80211_VERSION_MAJOR,\
++				       IEEE80211_VERSION_API, \
++				       IEEE80211_VERSION_MINOR)
+ 
+ #define IEEE80211_DATA_LEN		2304
+ /* Maximum size for the MA-UNITDATA primitive, 802.11 standard section
+@@ -104,6 +114,9 @@
+ #define IEEE80211_SCTL_FRAG		0x000F
+ #define IEEE80211_SCTL_SEQ		0xFFF0
+ 
++/* QOS control */
++#define IEEE80211_QCTL_TID		0x000F
++
+ /* debug macros */
+ 
+ #ifdef CONFIG_IEEE80211_DEBUG
+@@ -237,6 +250,11 @@
+ #define WLAN_CAPABILITY_SHORT_SLOT_TIME (1<<10)
+ #define WLAN_CAPABILITY_DSSS_OFDM (1<<13)
+ 
++/* 802.11g ERP information element */
++#define WLAN_ERP_NON_ERP_PRESENT (1<<0)
++#define WLAN_ERP_USE_PROTECTION (1<<1)
++#define WLAN_ERP_BARKER_PREAMBLE (1<<2)
++
+ /* Status codes */
+ enum ieee80211_statuscode {
+ 	WLAN_STATUS_SUCCESS = 0,
+@@ -744,6 +762,8 @@
+ #define NETWORK_HAS_IBSS_DFS            (1<<8)
+ #define NETWORK_HAS_TPC_REPORT          (1<<9)
+ 
++#define NETWORK_HAS_ERP_VALUE           (1<<10)
++
+ #define QOS_QUEUE_NUM                   4
+ #define QOS_OUI_LEN                     3
+ #define QOS_OUI_TYPE                    2
+@@ -965,6 +985,7 @@
+ 
+ enum {
+ 	IEEE80211_CH_PASSIVE_ONLY = (1 << 0),
++	IEEE80211_CH_80211H_RULES = (1 << 1),
+ 	IEEE80211_CH_B_ONLY = (1 << 2),
+ 	IEEE80211_CH_NO_IBSS = (1 << 3),
+ 	IEEE80211_CH_UNIFORM_SPREADING = (1 << 4),
+@@ -973,10 +994,10 @@
+ };
+ 
+ struct ieee80211_channel {
+-	u32 freq;
++	u32 freq;	/* in MHz */
+ 	u8 channel;
+ 	u8 flags;
+-	u8 max_power;
++	u8 max_power;	/* in dBm */
+ };
+ 
+ struct ieee80211_geo {
+@@ -1075,6 +1096,7 @@
+ 
+ 	int (*handle_management) (struct net_device * dev,
+ 				  struct ieee80211_network * network, u16 type);
++	int (*is_qos_active) (struct net_device *dev, struct sk_buff *skb);
+ 
+ 	/* Typical STA methods */
+ 	int (*handle_auth) (struct net_device * dev,
+@@ -1233,6 +1255,8 @@
+ 	return 0;
+ }
+ 
++extern const int ieee80211_api_version;
++
+ /* ieee80211.c */
+ extern void free_ieee80211(struct net_device *dev);
+ extern struct net_device *alloc_ieee80211(int sizeof_priv);
+@@ -1243,9 +1267,12 @@
+ extern int ieee80211_xmit(struct sk_buff *skb, struct net_device *dev);
+ extern void ieee80211_txb_free(struct ieee80211_txb *);
+ extern int ieee80211_tx_frame(struct ieee80211_device *ieee,
+-			      struct ieee80211_hdr *frame, int len);
++			      struct ieee80211_hdr *frame, int hdr_len,
++			      int total_len, int encrypt_mpdu);
+ 
+ /* ieee80211_rx.c */
++extern void ieee80211_rx_any(struct ieee80211_device *ieee,
++		     struct sk_buff *skb, struct ieee80211_rx_stats *stats);
+ extern int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
+ 			struct ieee80211_rx_stats *rx_stats);
+ /* make sure to set stats->len */
================================================================


More information about the pld-cvs-commit mailing list