Skip to contentSkip to conversation

wireless: move some utility functions from mac80211 to cfg80211

PATCH Superseded Zhu Yi 2 participants 3 messages May 21, 2009

Subsystems (3)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Zhu Yi

author
#0 lore raw

PATCH v2 1/2 wireless: move some utility functions from mac80211 to cfg80211

The patch moves some utility functions from mac80211 to cfg80211. Because these functions are doing generic 802.11 operations so they are not mac80211 specific. The moving allows some fullmac drivers to be also benefit from these utility functions.

---
V2: address comments from Johannes Berg on moving ieee80211_key_len to

    include/linux/ieee80211.h and keep ieee802_1d_to_ac static, etc.
 include/linux/ieee80211.h  |    9 ++
 include/net/cfg80211.h     |   47 +++++++
 include/net/mac80211.h     |   28 ----
 net/mac80211/ieee80211_i.h |    2 -
 net/mac80211/mesh.h        |    4 -
 net/mac80211/rx.c          |   89 +------------
 net/mac80211/util.c        |   73 -----------
 net/mac80211/wme.c         |   30 +----
 net/wireless/util.c        |  305 ++++++++++++++++++++++++++++++++++++++++++++
 9 files changed, 366 insertions(+), 221 deletions(-)
include/linux/ieee80211.h +9 -0
index 05c29c0..34de8b2 100644
@@ -493,6 +493,7 @@ struct ieee80211s_hdr {
 /* Mesh flags */
 #define MESH_FLAGS_AE_A4 	0x1
 #define MESH_FLAGS_AE_A5_A6	0x2
+#define MESH_FLAGS_AE		0x3
 #define MESH_FLAGS_PS_DEEP	0x4
 
 /**
@@ -1085,6 +1086,14 @@ enum ieee80211_spectrum_mgmt_actioncode {
 	WLAN_ACTION_SPCT_CHL_SWITCH = 4,
 };
 
+/* Security key length */
+enum ieee80211_key_len {
+	WLAN_KEY_LEN_WEP40 = 5,
+	WLAN_KEY_LEN_WEP104 = 13,
+	WLAN_KEY_LEN_CCMP = 16,
+	WLAN_KEY_LEN_TKIP = 32,
+};
+
 /*
  * IEEE 802.11-2007 7.3.2.9 Country information element
  *
include/net/cfg80211.h +47 -0

53 lines not on this page · raw message

include/net/mac80211.h +0 -28
index d10ed17..5314580 100644
@@ -673,16 +673,6 @@ enum ieee80211_key_alg {
 };
 
 /**
- * enum ieee80211_key_len - key length
- * @LEN_WEP40: WEP 5-byte long key
- * @LEN_WEP104: WEP 13-byte long key
- */
-enum ieee80211_key_len {
-	LEN_WEP40 = 5,
-	LEN_WEP104 = 13,
-};
-
-/**
  * enum ieee80211_key_flags - key flags
  *
  * These flags are used for communication about keys between the driver
@@ -1813,24 +1803,6 @@ struct sk_buff *
 ieee80211_get_buffered_bc(struct ieee80211_hw *hw, struct ieee80211_vif *vif);
 
 /**
- * ieee80211_get_hdrlen_from_skb - get header length from data
- *
- * Given an skb with a raw 802.11 header at the data pointer this function
- * returns the 802.11 header length in bytes (not including encryption
- * headers). If the data in the sk_buff is too short to contain a valid 802.11
- * header the function returns 0.
- *
- * @skb: the frame
- */
-unsigned int ieee80211_get_hdrlen_from_skb(const struct sk_buff *skb);
-
-/**
- * ieee80211_hdrlen - get header length in bytes from frame control
- * @fc: frame control field in little-endian format
- */
-unsigned int ieee80211_hdrlen(__le16 fc);
-
-/**
  * ieee80211_get_tkip_key - get a TKIP rc4 for skb
  *
  * This function computes a TKIP rc4 key for an skb. It computes
net/mac80211/ieee80211_i.h +0 -2
index 8db8d16..c088c46 100644
@@ -1085,8 +1085,6 @@ static inline int __ieee80211_resume(struct ieee80211_hw *hw)
 
 /* utility functions/constants */
 extern void *mac80211_wiphy_privid; /* for wiphy privid */
-extern const unsigned char rfc1042_header[6];
-extern const unsigned char bridge_tunnel_header[6];
 u8 *ieee80211_get_bssid(struct ieee80211_hdr *hdr, size_t len,
 			enum nl80211_iftype type);
 int ieee80211_frame_duration(struct ieee80211_local *local, size_t len,
net/mac80211/mesh.h +0 -4
index 832bb50..c7d7281 100644
@@ -191,12 +191,8 @@ struct mesh_rmc {
 #define PLINK_CATEGORY		30
 #define MESH_PATH_SEL_CATEGORY	32
 
-/* Mesh Header Flags */
-#define IEEE80211S_FLAGS_AE	0x3
-
 /* Public interfaces */
 /* Various */
-int ieee80211_get_mesh_hdrlen(struct ieee80211s_hdr *meshhdr);
 int ieee80211_new_mesh_header(struct ieee80211s_hdr *meshhdr,
 		struct ieee80211_sub_if_data *sdata);
 int mesh_rmc_check(u8 *addr, struct ieee80211s_hdr *mesh_hdr,
net/mac80211/rx.c +4 -85

111 lines not on this page · raw message

net/mac80211/util.c +0 -73

85 lines not on this page · raw message

net/mac80211/wme.c +1 -29
index 45b74f3..694343b 100644
@@ -23,34 +23,6 @@
  */
 const int ieee802_1d_to_ac[8] = { 2, 3, 3, 2, 1, 1, 0, 0 };
 
-static const char llc_ip_hdr[8] = {0xAA, 0xAA, 0x3, 0, 0, 0, 0x08, 0};
-
-/* Given a data frame determine the 802.1p/1d tag to use.  */
-static unsigned int classify_1d(struct sk_buff *skb)
-{
-	unsigned int dscp;
-
-	/* skb->priority values from 256->263 are magic values to
-	 * directly indicate a specific 802.1d priority.  This is used
-	 * to allow 802.1d priority to be passed directly in from VLAN
-	 * tags, etc.
-	 */
-	if (skb->priority >= 256 && skb->priority <= 263)
-		return skb->priority - 256;
-
-	switch (skb->protocol) {
-	case htons(ETH_P_IP):
-		dscp = ip_hdr(skb)->tos & 0xfc;
-		break;
-
-	default:
-		return 0;
-	}
-
-	return dscp >> 5;
-}
-
-
 static int wme_downgrade_ac(struct sk_buff *skb)
 {
 	switch (skb->priority) {
@@ -94,7 +66,7 @@ static u16 classify80211(struct ieee80211_local *local, struct sk_buff *skb)
 
 	/* use the data classifier to determine what 802.1d tag the
 	 * data frame has */
-	skb->priority = classify_1d(skb);
+	skb->priority = cfg80211_classify8021d(skb);
 
 	/* in case we are a client verify acm is not set for this ac */
 	while (unlikely(local->wmm_acm & BIT(skb->priority))) {
net/wireless/util.c +305 -0

315 lines not on this page · raw message

Signature · 1 line
1.6.0.4
author
#1 lore raw

PATCH v2 2/2 iwmc3200wifi: Add new Intel Wireless Multicomm 802.11 driver

This driver supports Intel's full MAC wireless multicomm 802.11 hardware. Although the hardware is a 802.11agn device, we currently only support 802.11ag, in managed and ad-hoc mode (no AP mode for now).

---
V2: adapt to changes in patch 1/2 V2.

 drivers/net/wireless/Kconfig                 |    1 +
 drivers/net/wireless/Makefile                |    2 +
 drivers/net/wireless/iwmc3200wifi/Kconfig    |   23 +
 drivers/net/wireless/iwmc3200wifi/Makefile   |    5 +
 drivers/net/wireless/iwmc3200wifi/bus.h      |   57 +
 drivers/net/wireless/iwmc3200wifi/cfg80211.c |  409 ++++++++
 drivers/net/wireless/iwmc3200wifi/cfg80211.h |   31 +
 drivers/net/wireless/iwmc3200wifi/commands.c |  920 +++++++++++++++++
 drivers/net/wireless/iwmc3200wifi/commands.h |  419 ++++++++
 drivers/net/wireless/iwmc3200wifi/debug.h    |  124 +++
 drivers/net/wireless/iwmc3200wifi/debugfs.c  |  453 ++++++++
 drivers/net/wireless/iwmc3200wifi/eeprom.c   |  187 ++++
 drivers/net/wireless/iwmc3200wifi/eeprom.h   |  114 ++
 drivers/net/wireless/iwmc3200wifi/fw.c       |  388 +++++++
 drivers/net/wireless/iwmc3200wifi/fw.h       |  100 ++
 drivers/net/wireless/iwmc3200wifi/hal.c      |  464 +++++++++
 drivers/net/wireless/iwmc3200wifi/hal.h      |  236 +++++
 drivers/net/wireless/iwmc3200wifi/iwm.h      |  350 +++++++
 drivers/net/wireless/iwmc3200wifi/lmac.h     |  457 ++++++++
 drivers/net/wireless/iwmc3200wifi/main.c     |  680 ++++++++++++
 drivers/net/wireless/iwmc3200wifi/netdev.c   |  172 +++
 drivers/net/wireless/iwmc3200wifi/rfkill.c   |   88 ++
 drivers/net/wireless/iwmc3200wifi/rx.c       | 1431 ++++++++++++++++++++++++++
 drivers/net/wireless/iwmc3200wifi/rx.h       |   60 ++
 drivers/net/wireless/iwmc3200wifi/sdio.c     |  516 ++++++++++
 drivers/net/wireless/iwmc3200wifi/sdio.h     |   67 ++
 drivers/net/wireless/iwmc3200wifi/tx.c       |  492 +++++++++
 drivers/net/wireless/iwmc3200wifi/umac.h     |  744 +++++++++++++
 drivers/net/wireless/iwmc3200wifi/wext.c     |  723 +++++++++++++
 29 files changed, 9713 insertions(+), 0 deletions(-)
 create mode 100644 drivers/net/wireless/iwmc3200wifi/Kconfig
 create mode 100644 drivers/net/wireless/iwmc3200wifi/Makefile
 create mode 100644 drivers/net/wireless/iwmc3200wifi/bus.h
 create mode 100644 drivers/net/wireless/iwmc3200wifi/cfg80211.c
 create mode 100644 drivers/net/wireless/iwmc3200wifi/cfg80211.h
 create mode 100644 drivers/net/wireless/iwmc3200wifi/commands.c
 create mode 100644 drivers/net/wireless/iwmc3200wifi/commands.h
 create mode 100644 drivers/net/wireless/iwmc3200wifi/debug.h
 create mode 100644 drivers/net/wireless/iwmc3200wifi/debugfs.c
 create mode 100644 drivers/net/wireless/iwmc3200wifi/eeprom.c
 create mode 100644 drivers/net/wireless/iwmc3200wifi/eeprom.h
 create mode 100644 drivers/net/wireless/iwmc3200wifi/fw.c
 create mode 100644 drivers/net/wireless/iwmc3200wifi/fw.h
 create mode 100644 drivers/net/wireless/iwmc3200wifi/hal.c
 create mode 100644 drivers/net/wireless/iwmc3200wifi/hal.h
 create mode 100644 drivers/net/wireless/iwmc3200wifi/iwm.h
 create mode 100644 drivers/net/wireless/iwmc3200wifi/lmac.h
 create mode 100644 drivers/net/wireless/iwmc3200wifi/main.c
 create mode 100644 drivers/net/wireless/iwmc3200wifi/netdev.c
 create mode 100644 drivers/net/wireless/iwmc3200wifi/rfkill.c
 create mode 100644 drivers/net/wireless/iwmc3200wifi/rx.c
 create mode 100644 drivers/net/wireless/iwmc3200wifi/rx.h
 create mode 100644 drivers/net/wireless/iwmc3200wifi/sdio.c
 create mode 100644 drivers/net/wireless/iwmc3200wifi/sdio.h
 create mode 100644 drivers/net/wireless/iwmc3200wifi/tx.c
 create mode 100644 drivers/net/wireless/iwmc3200wifi/umac.h
 create mode 100644 drivers/net/wireless/iwmc3200wifi/wext.c
drivers/net/wireless/Kconfig +1 -0
index 91be3e7..a67d292 100644
@@ -501,5 +501,6 @@ source "drivers/net/wireless/zd1211rw/Kconfig"
 source "drivers/net/wireless/rt2x00/Kconfig"
 source "drivers/net/wireless/orinoco/Kconfig"
 source "drivers/net/wireless/wl12xx/Kconfig"
+source "drivers/net/wireless/iwmc3200wifi/Kconfig"
 
 endmenu
drivers/net/wireless/Makefile +2 -0
index f2b1861..7a4647e 100644
@@ -60,3 +60,5 @@ obj-$(CONFIG_ATH_COMMON)	+= ath/
 obj-$(CONFIG_MAC80211_HWSIM)	+= mac80211_hwsim.o
 
 obj-$(CONFIG_WL12XX)	+= wl12xx/
+
+obj-$(CONFIG_IWM)	+= iwmc3200wifi/
drivers/net/wireless/iwmc3200wifi/Kconfig new file +23 -0
new file mode 100644
index 0000000..ae84dda
@@ -0,0 +1,23 @@
+config IWM
+	tristate "Intel Wireless Multicomm 3200 WiFi driver"
+	depends on MMC && WLAN_80211 && EXPERIMENTAL
+	select LIB80211
+	select FW_LOADER
+	select RFKILL
+
+config IWM_DEBUG
+	bool "Enable full debugging output in iwmc3200wifi"
+	depends on IWM && DEBUG_FS
+	---help---
+	  This option will enable debug tracing and setting for iwm
+
+	  You can set the debug level and module through debugfs. By
+	  default all modules are set to the IWL_DL_ERR level.
+	  To see the list of debug modules and levels, see iwm/debug.h
+
+	  For example, if you want the full MLME debug output:
+	  echo 0xff > /debug/iwm/phyN/debug/mlme
+
+	  Or, if you want the full debug, for all modules:
+	  echo 0xff > /debug/iwm/phyN/debug/level
+	  echo 0xff > /debug/iwm/phyN/debug/modules
drivers/net/wireless/iwmc3200wifi/Makefile new file +5 -0
new file mode 100644
index 0000000..7cb415e
@@ -0,0 +1,5 @@
+obj-$(CONFIG_IWM) := iwmc3200wifi.o
+iwmc3200wifi-objs += main.o netdev.o rx.o tx.o sdio.o hal.o fw.o
+iwmc3200wifi-objs += commands.o wext.o cfg80211.o eeprom.o rfkill.o
+
+iwmc3200wifi-$(CONFIG_IWM_DEBUG) += debugfs.o
drivers/net/wireless/iwmc3200wifi/bus.h new file +57 -0

57 lines not on this page · raw message

drivers/net/wireless/iwmc3200wifi/cfg80211.c new file +409 -0

409 lines not on this page · raw message

drivers/net/wireless/iwmc3200wifi/cfg80211.h new file +31 -0
new file mode 100644
index 0000000..56a3414
@@ -0,0 +1,31 @@
+/*
+ * Intel Wireless Multicomm 3200 WiFi driver
+ *
+ * Copyright (C) 2009 Intel Corporation <[email protected]>
+ * Samuel Ortiz <[email protected]>
+ * Zhu Yi <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License version
+ * 2 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ *
+ */
+
+#ifndef __IWM_CFG80211_H__
+#define __IWM_CFG80211_H__
+
+int iwm_cfg80211_inform_bss(struct iwm_priv *iwm);
+struct wireless_dev *iwm_wdev_alloc(int sizeof_bus, struct device *dev);
+void iwm_wdev_free(struct iwm_priv *iwm);
+
+#endif
drivers/net/wireless/iwmc3200wifi/commands.c new file +920 -0

920 lines not on this page · raw message

drivers/net/wireless/iwmc3200wifi/commands.h new file +419 -0

419 lines not on this page · raw message

drivers/net/wireless/iwmc3200wifi/debug.h new file +124 -0

124 lines not on this page · raw message

drivers/net/wireless/iwmc3200wifi/debugfs.c new file +453 -0

453 lines not on this page · raw message

drivers/net/wireless/iwmc3200wifi/eeprom.c new file +187 -0

187 lines not on this page · raw message

drivers/net/wireless/iwmc3200wifi/eeprom.h new file +114 -0

114 lines not on this page · raw message

drivers/net/wireless/iwmc3200wifi/fw.c new file +388 -0

247 lines not on this page · raw message

drivers/net/wireless/iwmc3200wifi/fw.h new file +100 -0

100 lines not on this page · raw message

drivers/net/wireless/iwmc3200wifi/hal.c new file +464 -0

464 lines not on this page · raw message

drivers/net/wireless/iwmc3200wifi/hal.h new file +236 -0

236 lines not on this page · raw message

drivers/net/wireless/iwmc3200wifi/iwm.h new file +350 -0

350 lines not on this page · raw message

drivers/net/wireless/iwmc3200wifi/lmac.h new file +457 -0

457 lines not on this page · raw message

drivers/net/wireless/iwmc3200wifi/main.c new file +680 -0

680 lines not on this page · raw message

drivers/net/wireless/iwmc3200wifi/netdev.c new file +172 -0

172 lines not on this page · raw message

drivers/net/wireless/iwmc3200wifi/rfkill.c new file +88 -0

88 lines not on this page · raw message

drivers/net/wireless/iwmc3200wifi/rx.c new file +1431 -0

1,431 lines not on this page · raw message

drivers/net/wireless/iwmc3200wifi/rx.h new file +60 -0

60 lines not on this page · raw message

drivers/net/wireless/iwmc3200wifi/sdio.c new file +516 -0

516 lines not on this page · raw message

drivers/net/wireless/iwmc3200wifi/sdio.h new file +67 -0

67 lines not on this page · raw message

drivers/net/wireless/iwmc3200wifi/tx.c new file +492 -0

492 lines not on this page · raw message

drivers/net/wireless/iwmc3200wifi/umac.h new file +744 -0

744 lines not on this page · raw message

drivers/net/wireless/iwmc3200wifi/wext.c new file +723 -0

723 lines not on this page · raw message

The rest of this diff is not shown. View the raw message.

Signature · 1 line
1.6.0.4

Part of the diff is not shown here. View the raw message.

maintainer
#2 lore raw
In reply to Zhu Yi

include/net/mac80211.h enum ieee80211_key_alg { · line 683

Quoted 9 lines · Zhu Yi

/**
- * enum ieee80211_key_len - key length
- * @LEN_WEP40: WEP 5-byte long key
- * @LEN_WEP104: WEP 13-byte long key
- */

include/net/mac80211.h +0 -4
-enum ieee80211_key_len {
-	LEN_WEP40 = 5,
-	LEN_WEP104 = 13,
-};

You don't seem to be updating the users of these? I have no problem with keeping them here either, but as-is this would break ath5k/9k/ar9170, b43 and rt2x00 compilation afaict.

johannes