Commit 6a553775 authored by Jeff Garzik's avatar Jeff Garzik

airo wireless netdrvr: s/routine/func/ to fix build (wq-related breakage)

parent 7200860b
...@@ -1316,7 +1316,7 @@ static void airo_do_xmit(struct net_device *dev) { ...@@ -1316,7 +1316,7 @@ static void airo_do_xmit(struct net_device *dev) {
if (down_trylock(&priv->sem) != 0) { if (down_trylock(&priv->sem) != 0) {
netif_stop_queue(dev); netif_stop_queue(dev);
priv->xmit.task.routine = (void (*)(void *))airo_do_xmit; priv->xmit.task.func = (void (*)(void *))airo_do_xmit;
priv->xmit.task.data = (void *)dev; priv->xmit.task.data = (void *)dev;
schedule_work(&priv->xmit.task); schedule_work(&priv->xmit.task);
return; return;
...@@ -1378,7 +1378,7 @@ static void airo_do_xmit11(struct net_device *dev) { ...@@ -1378,7 +1378,7 @@ static void airo_do_xmit11(struct net_device *dev) {
if (down_trylock(&priv->sem) != 0) { if (down_trylock(&priv->sem) != 0) {
netif_stop_queue(dev); netif_stop_queue(dev);
priv->xmit11.task.routine = (void (*)(void *))airo_do_xmit11; priv->xmit11.task.func = (void (*)(void *))airo_do_xmit11;
priv->xmit11.task.data = (void *)dev; priv->xmit11.task.data = (void *)dev;
schedule_work(&priv->xmit11.task); schedule_work(&priv->xmit11.task);
return; return;
...@@ -1464,7 +1464,7 @@ static void airo_end_promisc(struct airo_info *ai) { ...@@ -1464,7 +1464,7 @@ static void airo_end_promisc(struct airo_info *ai) {
completecommand(ai, &rsp); completecommand(ai, &rsp);
up(&ai->sem); up(&ai->sem);
} else { } else {
ai->promisc_task.routine = (void (*)(void *))airo_end_promisc; ai->promisc_task.func = (void (*)(void *))airo_end_promisc;
ai->promisc_task.data = (void *)ai; ai->promisc_task.data = (void *)ai;
schedule_work(&ai->promisc_task); schedule_work(&ai->promisc_task);
} }
...@@ -1480,7 +1480,7 @@ static void airo_set_promisc(struct airo_info *ai) { ...@@ -1480,7 +1480,7 @@ static void airo_set_promisc(struct airo_info *ai) {
sendcommand(ai, &cmd); sendcommand(ai, &cmd);
airo_end_promisc(ai); airo_end_promisc(ai);
} else { } else {
ai->promisc_task.routine = (void (*)(void *))airo_set_promisc; ai->promisc_task.func = (void (*)(void *))airo_set_promisc;
ai->promisc_task.data = (void *)ai; ai->promisc_task.data = (void *)ai;
schedule_work(&ai->promisc_task); schedule_work(&ai->promisc_task);
} }
...@@ -1812,7 +1812,7 @@ static void airo_send_event(struct net_device *dev) { ...@@ -1812,7 +1812,7 @@ static void airo_send_event(struct net_device *dev) {
/* Send event to user space */ /* Send event to user space */
wireless_send_event(dev, SIOCGIWAP, &wrqu, NULL); wireless_send_event(dev, SIOCGIWAP, &wrqu, NULL);
} else { } else {
ai->event_task.routine = (void (*)(void *))airo_send_event; ai->event_task.func = (void (*)(void *))airo_send_event;
ai->event_task.data = (void *)dev; ai->event_task.data = (void *)dev;
schedule_work(&ai->event_task); schedule_work(&ai->event_task);
} }
...@@ -1831,7 +1831,7 @@ static void airo_read_mic(struct airo_info *ai) { ...@@ -1831,7 +1831,7 @@ static void airo_read_mic(struct airo_info *ai) {
micinit (ai, &mic_rid); micinit (ai, &mic_rid);
#endif #endif
} else { } else {
ai->mic_task.routine = (void (*)(void *))airo_read_mic; ai->mic_task.func = (void (*)(void *))airo_read_mic;
ai->mic_task.data = (void *)ai; ai->mic_task.data = (void *)ai;
schedule_work(&ai->mic_task); schedule_work(&ai->mic_task);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment