aboutsummaryrefslogtreecommitdiffstats
path: root/net/atm/lec.c
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2006-11-22 09:57:56 -0500
committerDavid Howells <dhowells@redhat.com>2006-11-22 09:57:56 -0500
commitc4028958b6ecad064b1a6303a6a5906d4fe48d73 (patch)
tree1c4c89652c62a75da09f9b9442012007e4ac6250 /net/atm/lec.c
parent65f27f38446e1976cc98fd3004b110fedcddd189 (diff)
WorkStruct: make allyesconfig
Fix up for make allyesconfig. Signed-Off-By: David Howells <dhowells@redhat.com>
Diffstat (limited to 'net/atm/lec.c')
-rw-r--r--net/atm/lec.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/net/atm/lec.c b/net/atm/lec.c
index 66c57c1091a8..e801fff69dc0 100644
--- a/net/atm/lec.c
+++ b/net/atm/lec.c
@@ -1458,7 +1458,7 @@ static void lane2_associate_ind(struct net_device *dev, u8 *mac_addr,
1458 1458
1459#define LEC_ARP_REFRESH_INTERVAL (3*HZ) 1459#define LEC_ARP_REFRESH_INTERVAL (3*HZ)
1460 1460
1461static void lec_arp_check_expire(void *data); 1461static void lec_arp_check_expire(struct work_struct *work);
1462static void lec_arp_expire_arp(unsigned long data); 1462static void lec_arp_expire_arp(unsigned long data);
1463 1463
1464/* 1464/*
@@ -1481,7 +1481,7 @@ static void lec_arp_init(struct lec_priv *priv)
1481 INIT_HLIST_HEAD(&priv->lec_no_forward); 1481 INIT_HLIST_HEAD(&priv->lec_no_forward);
1482 INIT_HLIST_HEAD(&priv->mcast_fwds); 1482 INIT_HLIST_HEAD(&priv->mcast_fwds);
1483 spin_lock_init(&priv->lec_arp_lock); 1483 spin_lock_init(&priv->lec_arp_lock);
1484 INIT_WORK(&priv->lec_arp_work, lec_arp_check_expire, priv); 1484 INIT_DELAYED_WORK(&priv->lec_arp_work, lec_arp_check_expire);
1485 schedule_delayed_work(&priv->lec_arp_work, LEC_ARP_REFRESH_INTERVAL); 1485 schedule_delayed_work(&priv->lec_arp_work, LEC_ARP_REFRESH_INTERVAL);
1486} 1486}
1487 1487
@@ -1879,10 +1879,11 @@ static void lec_arp_expire_vcc(unsigned long data)
1879 * to ESI_FORWARD_DIRECT. This causes the flush period to end 1879 * to ESI_FORWARD_DIRECT. This causes the flush period to end
1880 * regardless of the progress of the flush protocol. 1880 * regardless of the progress of the flush protocol.
1881 */ 1881 */
1882static void lec_arp_check_expire(void *data) 1882static void lec_arp_check_expire(struct work_struct *work)
1883{ 1883{
1884 unsigned long flags; 1884 unsigned long flags;
1885 struct lec_priv *priv = data; 1885 struct lec_priv *priv =
1886 container_of(work, struct lec_priv, lec_arp_work.work);
1886 struct hlist_node *node, *next; 1887 struct hlist_node *node, *next;
1887 struct lec_arp_table *entry; 1888 struct lec_arp_table *entry;
1888 unsigned long now; 1889 unsigned long now;