Backout watchdog task patch from John Linville
Signed-off-by: Mallikarjuna R Chilakala <[EMAIL PROTECTED]>
Signed-off-by: Ganesh Venkatesan <[EMAIL PROTECTED]>
Signed-off-by: John Ronciak <[EMAIL PROTECTED]>
diff -up netdev-2.6/drivers/net/e1000/e1000.h
netdev-2.6.new/drivers/net/e1000/e1000.h
--- netdev-2.6/drivers/net/e1000/e1000.h 2005-08-04 17:44:43.000000000
-0700
+++ netdev-2.6.new/drivers/net/e1000/e1000.h 2005-08-04 17:44:45.000000000
-0700
@@ -251,7 +251,6 @@ struct e1000_adapter {
spinlock_t stats_lock;
atomic_t irq_sem;
struct work_struct tx_timeout_task;
- struct work_struct watchdog_task;
uint8_t fc_autoneg;
struct timer_list blink_timer;
diff -up netdev-2.6/drivers/net/e1000/e1000_main.c
netdev-2.6.new/drivers/net/e1000/e1000_main.c
--- netdev-2.6/drivers/net/e1000/e1000_main.c 2005-08-04 17:44:43.000000000
-0700
+++ netdev-2.6.new/drivers/net/e1000/e1000_main.c 2005-08-04
17:44:45.000000000 -0700
@@ -141,7 +141,6 @@ int e1000_up(struct e1000_adapter *adapt
static void e1000_set_multi(struct net_device *netdev);
static void e1000_update_phy_info(unsigned long data);
static void e1000_watchdog(unsigned long data);
-static void e1000_watchdog_task(struct e1000_adapter *adapter);
static void e1000_82547_tx_fifo_stall(unsigned long data);
static int e1000_xmit_frame(struct sk_buff *skb, struct net_device *netdev);
static struct net_device_stats * e1000_get_stats(struct net_device *netdev);
@@ -670,9 +670,6 @@ e1000_probe(struct pci_dev *pdev,
adapter->watchdog_timer.function = &e1000_watchdog;
adapter->watchdog_timer.data = (unsigned long) adapter;
- INIT_WORK(&adapter->watchdog_task,
- (void (*)(void *))e1000_watchdog_task, adapter);
-
init_timer(&adapter->phy_info_timer);
adapter->phy_info_timer.function = &e1000_update_phy_info;
adapter->phy_info_timer.data = (unsigned long) adapter;
@@ -776,8 +814,6 @@ e1000_remove(struct pci_dev *pdev)
struct e1000_adapter *adapter = netdev_priv(netdev);
uint32_t ctrl_ext;
uint32_t manc, swsm;
-
- flush_scheduled_work();
#ifdef CONFIG_E1000_NAPI
int i;
#endif
@@ -2191,14 +1831,6 @@ static void
e1000_watchdog(unsigned long data)
{
struct e1000_adapter *adapter = (struct e1000_adapter *) data;
-
- /* Do the rest outside of interrupt context */
- schedule_work(&adapter->watchdog_task);
-}
-
-static void
-e1000_watchdog_task(struct e1000_adapter *adapter)
-{
struct net_device *netdev = adapter->netdev;
struct e1000_tx_ring *txdr = &adapter->tx_ring[0];
uint32_t link;
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
