Skip to contentSkip to conversation

sync bcm43xx-d80211 to bcm43xx

PATCH New Michael Buesch 1 participant 1 message Apr 18, 2006

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 sync bcm43xx-d80211 to bcm43xx

Hi John,

I already sent these three patches for inclusion into the softmac version of the driver. Here are the devicescape port versions for inclusion in your wireless-dev tree.

Signature · 1 line
Greetings Michael.
drivers/net/wireless/bcm43xx-d80211/bcm43xx.h +14 -3
Index: wireless-dev-ds/drivers/net/wireless/bcm43xx-d80211/bcm43xx.h
===================================================================
@@ -18,7 +18,6 @@
 
 #include "bcm43xx_debugfs.h"
 #include "bcm43xx_leds.h"
-#include "bcm43xx_sysfs.h"
 
 
 #define PFX				KBUILD_MODNAME ": "
@@ -628,8 +627,6 @@
 };
 
 struct bcm43xx_private {
-	struct bcm43xx_sysfs sysfs;
-
 	struct ieee80211_hw *ieee;
 	struct ieee80211_low_level_stats ieee_stats;
 	int iw_mode;
@@ -843,6 +840,20 @@
 	return phy->_lo_pairs + (radio_attenuation + 14 * (baseband_attenuation / 2));
 }
 
+struct device;
+
+static inline
+struct bcm43xx_private * dev_to_bcm(struct device *dev)
+{
+	struct net_device *net_dev;
+	struct bcm43xx_private *bcm;
+
+	net_dev = dev_get_drvdata(dev);
+	bcm = bcm43xx_priv(net_dev);
+
+	return bcm;
+}
+
 
 static inline
 u16 bcm43xx_read16(struct bcm43xx_private *bcm, u16 offset)
drivers/net/wireless/bcm43xx-d80211/bcm43xx_main.c +1 -0
Index: wireless-dev-ds/drivers/net/wireless/bcm43xx-d80211/bcm43xx_main.c
===================================================================
@@ -52,6 +52,7 @@
 #include "bcm43xx_sysfs.h"
 #include "bcm43xx_ethtool.h"
 #include "bcm43xx_xmit.h"
+#include "bcm43xx_sysfs.h"
 
 
 MODULE_DESCRIPTION("Broadcom BCM43xx wireless driver");
drivers/net/wireless/bcm43xx-d80211/bcm43xx_sysfs.c +67 -48

217 lines not on this page · raw message

drivers/net/wireless/bcm43xx-d80211/bcm43xx_sysfs.h +0 -16
Index: wireless-dev-ds/drivers/net/wireless/bcm43xx-d80211/bcm43xx_sysfs.h
===================================================================
@@ -1,22 +1,6 @@
 #ifndef BCM43xx_SYSFS_H_
 #define BCM43xx_SYSFS_H_
 
-#include <linux/device.h>
-
-
-struct bcm43xx_sysfs {
-	struct device_attribute attr_sprom;
-	struct device_attribute attr_interfmode;
-	struct device_attribute attr_preamble;
-};
-
-#define devattr_to_bcm(attr, attr_name)	({				\
-	struct bcm43xx_sysfs *__s; struct bcm43xx_private *__p;		\
-	__s = container_of((attr), struct bcm43xx_sysfs, attr_name);	\
-	__p = container_of(__s, struct bcm43xx_private, sysfs);		\
-	__p;								\
-					})
-
 struct bcm43xx_private;
 
 int bcm43xx_sysfs_register(struct bcm43xx_private *bcm);
drivers/net/wireless/bcm43xx-d80211/bcm43xx_power.c +68 -47

162 lines not on this page · raw message

drivers/net/wireless/bcm43xx-d80211/bcm43xx_power.h +9 -0
Index: wireless-dev-ds/drivers/net/wireless/bcm43xx-d80211/bcm43xx_power.h
===================================================================
@@ -33,6 +33,15 @@
 
 #include <linux/types.h>
 
+/* Clock sources */
+enum {
+	/* PCI clock */
+	BCM43xx_PCTL_CLKSRC_PCI,
+	/* Crystal slow clock oscillator */
+	BCM43xx_PCTL_CLKSRC_XTALOS,
+	/* Low power oscillator */
+	BCM43xx_PCTL_CLKSRC_LOPWROS,
+};
 
 struct bcm43xx_private;
 
drivers/net/wireless/bcm43xx-d80211/bcm43xx_phy.c +1 -0
Index: wireless-dev-ds/drivers/net/wireless/bcm43xx-d80211/bcm43xx_phy.c
===================================================================
@@ -2151,6 +2151,7 @@
 				phy->tssi2dbm = NULL;
 				printk(KERN_ERR PFX "Could not generate "
 						    "tssi2dBm table\n");
+				kfree(dyn_tssi2dbm);
 				return -ENODEV;
 			}
 		phy->tssi2dbm = dyn_tssi2dbm;