Skip to contentSkip to conversation

o11s: (zd1211) support for mesh interface and beaconing

PATCH In review Luis Carlos Cobo 2 participants 2 messages Feb 22, 2008 Networking drivers (wireless)

lore
Share & tools
lore
#0 lore raw

PATCH v2 2/13 o11s: (zd1211) support for mesh interface and beaconing

This patch adds mesh interface support to the zd1211rw-mac80211 driver.

The previously unused CR_CAM_MODE register is set to MODE_AP_WDS. This makes the driver ack mesh (WDS) frames. It does not affect Infra functionality of the driver.

Previously missing beaconing support has been added. This might also help implement a currently missing ah-hoc mode.

Support for interrupts from the device have been added, but we are not handling most of them.

Mesh interfaces are considered associated as long as the interface is up.

---
 drivers/net/wireless/zd1211rw/zd_chip.c |    1 +
 drivers/net/wireless/zd1211rw/zd_chip.h |    8 +++
 drivers/net/wireless/zd1211rw/zd_mac.c  |   75 ++++++++++++++++++++++++++++++-
 drivers/net/wireless/zd1211rw/zd_mac.h  |    3 +
 drivers/net/wireless/zd1211rw/zd_usb.c  |   11 ++++-
 5 files changed, 94 insertions(+), 4 deletions(-)
drivers/net/wireless/zd1211rw/zd_chip.c +1 -0
index e3fba6f..66abc4e 100644
@@ -809,6 +809,7 @@ static int hw_init_hmac(struct zd_chip *chip)
 		{ CR_AFTER_PNP,			0x1 },
 		{ CR_WEP_PROTECT,		0x114 },
 		{ CR_IFS_VALUE,			IFS_VALUE_DEFAULT },
+		{ CR_CAM_MODE,			MODE_AP_WDS},
 	};
 
 	ZD_ASSERT(mutex_is_locked(&chip->mutex));
drivers/net/wireless/zd1211rw/zd_chip.h +8 -0
index 009c037..e44b9d6 100644
@@ -489,6 +489,7 @@ enum {
 
 #define CR_RX_OFFSET			CTL_REG(0x065c)
 
+#define CR_BCN_LENGTH			CTL_REG(0x0664)
 #define CR_PHY_DELAY			CTL_REG(0x066C)
 #define CR_BCN_FIFO			CTL_REG(0x0670)
 #define CR_SNIFFER_ON			CTL_REG(0x0674)
@@ -545,6 +546,8 @@ enum {
 #define RX_FILTER_CTRL (RX_FILTER_RTS | RX_FILTER_CTS | \
 	RX_FILTER_CFEND | RX_FILTER_CFACK)
 
+#define BCN_MODE_IBSS			0x2000000
+
 /* Monitor mode sets filter to 0xfffff */
 
 #define CR_ACK_TIMEOUT_EXT		CTL_REG(0x0690)
@@ -578,6 +581,11 @@ enum {
 
 /* CAM: Continuous Access Mode (power management) */
 #define CR_CAM_MODE			CTL_REG(0x0700)
+#define MODE_IBSS			0x0
+#define MODE_AP				0x1
+#define MODE_STA			0x2
+#define MODE_AP_WDS			0x3
+
 #define CR_CAM_ROLL_TB_LOW		CTL_REG(0x0704)
 #define CR_CAM_ROLL_TB_HIGH		CTL_REG(0x0708)
 #define CR_CAM_ADDRESS			CTL_REG(0x070C)
drivers/net/wireless/zd1211rw/zd_mac.c +73 -2

113 lines not on this page · raw message

drivers/net/wireless/zd1211rw/zd_mac.h +3 -0
index 67dea97..7117024 100644
@@ -172,12 +172,15 @@ struct zd_tx_skb_control_block {
 struct zd_mac {
 	struct zd_chip chip;
 	spinlock_t lock;
+	spinlock_t intr_lock;
 	struct ieee80211_hw *hw;
 	struct housekeeping housekeeping;
 	struct work_struct set_multicast_hash_work;
 	struct work_struct set_rts_cts_work;
 	struct work_struct set_rx_filter_work;
+	struct work_struct process_intr;
 	struct zd_mc_hash multicast_hash;
+	u8 intr_buffer[USB_MAX_EP_INT_BUFFER];
 	u8 regdomain;
 	u8 default_regdomain;
 	int type;
drivers/net/wireless/zd1211rw/zd_usb.c +9 -2
index 7942b15..e34675c 100644
@@ -97,6 +97,7 @@ MODULE_DEVICE_TABLE(usb, usb_ids);
 #define FW_ZD1211B_PREFIX	"zd1211/zd1211b_"
 
 /* USB device initialization */
+static void int_urb_complete(struct urb *urb);
 
 static int request_fw_file(
 	const struct firmware **fw, const char *name, struct device *device)
@@ -336,11 +337,18 @@ static inline void handle_regs_int(struct urb *urb)
 	struct zd_usb *usb = urb->context;
 	struct zd_usb_interrupt *intr = &usb->intr;
 	int len;
+	u16 int_num;
 
 	ZD_ASSERT(in_interrupt());
 	spin_lock(&intr->lock);
 
-	if (intr->read_regs_enabled) {
+	int_num = le16_to_cpu(*(u16 *)(urb->transfer_buffer+2));
+	if (int_num == CR_INTERRUPT) {
+		struct zd_mac *mac = zd_hw_mac(zd_usb_to_hw(urb->context));
+		memcpy(&mac->intr_buffer, urb->transfer_buffer,
+				USB_MAX_EP_INT_BUFFER);
+		schedule_work(&mac->process_intr);
+	} else if (intr->read_regs_enabled) {
 		intr->read_regs.length = len = urb->actual_length;
 
 		if (len > sizeof(intr->read_regs.buffer))
@@ -351,7 +359,6 @@ static inline void handle_regs_int(struct urb *urb)
 		goto out;
 	}
 
-	dev_dbg_f(urb_dev(urb), "regs interrupt ignored\n");
 out:
 	spin_unlock(&intr->lock);
 }
Signature · 1 line
1.5.2.5
maintainer
#1 lore raw
Quoted 1 line · Luis Carlos Cobo

This patch adds mesh interface support to the zd1211rw-mac80211 driver.

Daniel, please review this, looks superficially fine to me.

johannes