Skip to contentSkip to conversation

rt2x00: Move interface init/deinit into rt2x00dev

PATCH In review Ivo van Doorn 1 participant 1 message Jul 31, 2007 Networking drivers (wireless)

lore
Share & tools
lore

Ivo van Doorn

author
#0 lore raw

PATCH 13/24 rt2x00: Move interface init/deinit into rt2x00dev

Quoted 1 line

From cab2bdf51680ec25521369fdb45e672842403abd Mon Sep 17 00:00:00 2001

From: Ivo van Doorn <[email protected]>
Date: Sat, 28 Jul 2007 15:58:53 +0200
Subject: [PATCH 13/24] rt2x00: Move interface init/deinit into rt2x00dev

Move interface init/deinit into rt2x00dev.c, this groups the initialization of the device together into a single function.

Signed-off-by Ivo van Doorn <[email protected]>
---
 drivers/net/wireless/rt2x00.h    |    9 ++++-
 drivers/net/wireless/rt2x00dev.c |   65 +++++++++++++++++++++++++++++++++++++-
 drivers/net/wireless/rt2x00dev.h |    5 ++-
 drivers/net/wireless/rt2x00mac.c |   59 ++--------------------------------
 4 files changed, 78 insertions(+), 60 deletions(-)
drivers/net/wireless/rt2x00.h +7 -2
index 9d07e80..5566c7a 100644
@@ -629,6 +629,11 @@ struct interface {
 	int type;
 
 	/*
+	 * MAC of the device.
+	 */
+	u8 *mac;
+
+	/*
 	 * BBSID of the AP to associate with.
 	 */
 	u8 bssid[ETH_ALEN];

@@ -638,13 +643,13 @@ struct interface {
 	 * monitor mode always forces promisc mode to be enabled,
 	 * so we need to store the promisc mode seperately.
 	 */
-	short promisc;
+	char promisc;
 
 	/*
 	 * Monitor mode count, the number of interfaces
 	 * in monitor mode that that have been added.
 	 */
-	short monitor_count;
+	char monitor_count;
 };
 
 static inline int is_interface_present(struct interface *intf)
drivers/net/wireless/rt2x00dev.c +64 -1

77 lines not on this page · raw message

drivers/net/wireless/rt2x00dev.h +3 -2
index c6feee3..b2b43fd 100644
@@ -40,9 +40,10 @@ void rt2x00lib_disable_radio(struct rt2x00_dev *rt2x00dev);
 void rt2x00lib_toggle_rx(struct rt2x00_dev *rt2x00dev, int enable);
 
 /*
- * Initialization/uninitialization handlers.
+ * Interface initialization/deinitialization.
  */
-int rt2x00lib_initialize(struct rt2x00_dev *rt2x00dev);
+int rt2x00lib_init_interface(struct rt2x00_dev *rt2x00dev);
+void rt2x00lib_deinit_interface(struct rt2x00_dev *rt2x00dev);
 
 /*
  * Config handlers.
drivers/net/wireless/rt2x00mac.c +4 -55

89 lines not on this page · raw message

Signature · 1 line
1.5.2.4