aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-12-07 06:30:30 -0500
committerJeff Garzik <jeff@garzik.org>2006-12-07 06:30:30 -0500
commit0ae851352a87db3f829511816a2da227860bf585 (patch)
tree5dbc2a5b3621e3e2ea9294f86392e69f394dd888
parent0bfdcc88df969af8de087d0fdddf8c0efa76b4b0 (diff)
[wireless] zd1211rw: workqueue-related build fixes
Signed-off-by: Jeff Garzik <jeff@garzik.org>
-rw-r--r--drivers/net/wireless/zd1211rw/zd_mac.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/wireless/zd1211rw/zd_mac.c b/drivers/net/wireless/zd1211rw/zd_mac.c
index 61c7916b7656..00ca704ece35 100644
--- a/drivers/net/wireless/zd1211rw/zd_mac.c
+++ b/drivers/net/wireless/zd1211rw/zd_mac.c
@@ -39,7 +39,7 @@ static void housekeeping_init(struct zd_mac *mac);
39static void housekeeping_enable(struct zd_mac *mac); 39static void housekeeping_enable(struct zd_mac *mac);
40static void housekeeping_disable(struct zd_mac *mac); 40static void housekeeping_disable(struct zd_mac *mac);
41 41
42static void set_multicast_hash_handler(void *mac_ptr); 42static void set_multicast_hash_handler(struct work_struct *work);
43 43
44int zd_mac_init(struct zd_mac *mac, 44int zd_mac_init(struct zd_mac *mac,
45 struct net_device *netdev, 45 struct net_device *netdev,
@@ -57,8 +57,7 @@ int zd_mac_init(struct zd_mac *mac,
57 softmac_init(ieee80211_priv(netdev)); 57 softmac_init(ieee80211_priv(netdev));
58 zd_chip_init(&mac->chip, netdev, intf); 58 zd_chip_init(&mac->chip, netdev, intf);
59 housekeeping_init(mac); 59 housekeeping_init(mac);
60 INIT_WORK(&mac->set_multicast_hash_work, set_multicast_hash_handler, 60 INIT_WORK(&mac->set_multicast_hash_work, set_multicast_hash_handler);
61 mac);
62 return 0; 61 return 0;
63} 62}
64 63
@@ -261,9 +260,10 @@ int zd_mac_set_mac_address(struct net_device *netdev, void *p)
261 return 0; 260 return 0;
262} 261}
263 262
264static void set_multicast_hash_handler(void *mac_ptr) 263static void set_multicast_hash_handler(struct work_struct *work)
265{ 264{
266 struct zd_mac *mac = mac_ptr; 265 struct zd_mac *mac = container_of(work, struct zd_mac,
266 set_multicast_hash_work);
267 struct zd_mc_hash hash; 267 struct zd_mc_hash hash;
268 268
269 spin_lock_irq(&mac->lock); 269 spin_lock_irq(&mac->lock);