diff options
author | David Howells <dhowells@redhat.com> | 2006-11-22 09:57:56 -0500 |
---|---|---|
committer | David Howells <dhowells@redhat.com> | 2006-11-22 09:57:56 -0500 |
commit | c4028958b6ecad064b1a6303a6a5906d4fe48d73 (patch) | |
tree | 1c4c89652c62a75da09f9b9442012007e4ac6250 /drivers/net/wireless/zd1211rw | |
parent | 65f27f38446e1976cc98fd3004b110fedcddd189 (diff) |
WorkStruct: make allyesconfig
Fix up for make allyesconfig.
Signed-Off-By: David Howells <dhowells@redhat.com>
Diffstat (limited to 'drivers/net/wireless/zd1211rw')
-rw-r--r-- | drivers/net/wireless/zd1211rw/zd_mac.c | 7 | ||||
-rw-r--r-- | drivers/net/wireless/zd1211rw/zd_mac.h | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/wireless/zd1211rw/zd_mac.c b/drivers/net/wireless/zd1211rw/zd_mac.c index a7d29bddb298..5e4f4b707375 100644 --- a/drivers/net/wireless/zd1211rw/zd_mac.c +++ b/drivers/net/wireless/zd1211rw/zd_mac.c | |||
@@ -1090,9 +1090,10 @@ void zd_dump_rx_status(const struct rx_status *status) | |||
1090 | 1090 | ||
1091 | #define LINK_LED_WORK_DELAY HZ | 1091 | #define LINK_LED_WORK_DELAY HZ |
1092 | 1092 | ||
1093 | static void link_led_handler(void *p) | 1093 | static void link_led_handler(struct work_struct *work) |
1094 | { | 1094 | { |
1095 | struct zd_mac *mac = p; | 1095 | struct zd_mac *mac = |
1096 | container_of(work, struct zd_mac, housekeeping.link_led_work.work); | ||
1096 | struct zd_chip *chip = &mac->chip; | 1097 | struct zd_chip *chip = &mac->chip; |
1097 | struct ieee80211softmac_device *sm = ieee80211_priv(mac->netdev); | 1098 | struct ieee80211softmac_device *sm = ieee80211_priv(mac->netdev); |
1098 | int is_associated; | 1099 | int is_associated; |
@@ -1113,7 +1114,7 @@ static void link_led_handler(void *p) | |||
1113 | 1114 | ||
1114 | static void housekeeping_init(struct zd_mac *mac) | 1115 | static void housekeeping_init(struct zd_mac *mac) |
1115 | { | 1116 | { |
1116 | INIT_WORK(&mac->housekeeping.link_led_work, link_led_handler, mac); | 1117 | INIT_DELAYED_WORK(&mac->housekeeping.link_led_work, link_led_handler); |
1117 | } | 1118 | } |
1118 | 1119 | ||
1119 | static void housekeeping_enable(struct zd_mac *mac) | 1120 | static void housekeeping_enable(struct zd_mac *mac) |
diff --git a/drivers/net/wireless/zd1211rw/zd_mac.h b/drivers/net/wireless/zd1211rw/zd_mac.h index b8ea3de7924a..7957cac3de25 100644 --- a/drivers/net/wireless/zd1211rw/zd_mac.h +++ b/drivers/net/wireless/zd1211rw/zd_mac.h | |||
@@ -121,7 +121,7 @@ enum mac_flags { | |||
121 | }; | 121 | }; |
122 | 122 | ||
123 | struct housekeeping { | 123 | struct housekeeping { |
124 | struct work_struct link_led_work; | 124 | struct delayed_work link_led_work; |
125 | }; | 125 | }; |
126 | 126 | ||
127 | #define ZD_MAC_STATS_BUFFER_SIZE 16 | 127 | #define ZD_MAC_STATS_BUFFER_SIZE 16 |