Hi John, Please pull git://git.kernel.org/pub/scm/linux/kernel/git/mwu/d80211-drivers.git for these patches:
adm8211-week51 branch:
adm8211: set phymode in RX
p54-week51 branch:
p54: fix device memory allocator
p54: fix TX of encrypted frames
p54: remove unnecessary use of __constant_cpu_to_*
p54: use hardware RX frequency reporting
p54: use link LED
p54: fix issues found by sparse
p54: set phymode in RX
zd1211rw-week51 branch:
zd1211rw-d80211: Fix of a locking bug
zd1211rw-d80211: Revert "zd1211rw: Removed unneeded packed attributes"
zd1211rw-d80211: Add 3 more device IDs
zd1211rw-d80211: Add ID for ZyXEL G-220
zd1211rw-d80211: Add ID for Planex GW-US54Mini
zd1211rw-d80211: Add ID for Belkin F5D7050 v4000
zd1211rw-d80211: cleanups
zd1211rw-d80211: Optimized handling of zero length entries in length info
zd1211rw-d80211: check IEEE80211_TXCTL_USE_CTS_PROTECT
zd1211rw-d80211: Use ieee80211_tx_status
zd1211rw-d80211: 2 new ZD1211B device ID's
zd1211rw-d80211: Add ID for Linksys WUSBF54G
The LED class patch for zd1211rw-d80211 was dropped.
A patch which updates zd1211rw-d80211 to the new workqueue API is attached
for when you pull those changes.
Thanks,
-Michael Wu
zd1211rw-d80211: fix workqueue breakage
From: Michael Wu <[EMAIL PROTECTED]>
This allows zd1211rw-d80211 to compile with the workqueue API changes.
Signed-off-by: Michael Wu <[EMAIL PROTECTED]>
---
drivers/net/wireless/d80211/zd1211rw/zd_mac.c | 7 ++++---
drivers/net/wireless/d80211/zd1211rw/zd_mac.h | 2 +-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/net/wireless/d80211/zd1211rw/zd_mac.c b/drivers/net/wireless/d80211/zd1211rw/zd_mac.c
index 6ee650f..7044ea3 100644
--- a/drivers/net/wireless/d80211/zd1211rw/zd_mac.c
+++ b/drivers/net/wireless/d80211/zd1211rw/zd_mac.c
@@ -625,9 +625,10 @@ struct ieee80211_hw *zd_mac_alloc(struct
#define LINK_LED_WORK_DELAY HZ
-static void link_led_handler(void *p)
+static void link_led_handler(struct work_struct *work)
{
- struct zd_mac *mac = p;
+ struct zd_mac *mac =
+ container_of(work, struct zd_mac, housekeeping.link_led_work);
struct zd_chip *chip = &mac->chip;
int is_associated;
int r;
@@ -647,7 +648,7 @@ static void link_led_handler(void *p)
static void housekeeping_init(struct zd_mac *mac)
{
- INIT_WORK(&mac->housekeeping.link_led_work, link_led_handler, mac);
+ INIT_DELAYED_WORK(&mac->housekeeping.link_led_work, link_led_handler);
}
static void housekeeping_enable(struct zd_mac *mac)
diff --git a/drivers/net/wireless/d80211/zd1211rw/zd_mac.h b/drivers/net/wireless/d80211/zd1211rw/zd_mac.h
index e2ba410..6c402d9 100644
--- a/drivers/net/wireless/d80211/zd1211rw/zd_mac.h
+++ b/drivers/net/wireless/d80211/zd1211rw/zd_mac.h
@@ -119,7 +119,7 @@ enum mac_flags {
};
struct housekeeping {
- struct work_struct link_led_work;
+ struct delayed_work link_led_work;
};
#define ZD_MAC_STATS_BUFFER_SIZE 16
pgpm7T0K5zliF.pgp
Description: PGP signature
