evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[netdrvr 8139too] use cancel_rearming_delayed_work() to cancel thread

Browse source 
Noted by Herbert Xu.
This commit is contained in:
Jeff Garzik 2005-11-04 22:36:28 -05:00
parent a15e0384dd
commit 38b492a21a
1 changed files with 9 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
drivers/net/8139too.c
View file

@ -586,7 +586,8 @@ struct rtl8139_private {
dma_addr_t tx_bufs_dma; dma_addr_t tx_bufs_dma;
signed char phys[4]; /* MII device addresses. */ signed char phys[4]; /* MII device addresses. */
char twistie, twist_row, twist_col; /* Twister tune state. */ char twistie, twist_row, twist_col; /* Twister tune state. */
unsigned int default_port:4; /* Last dev->if_port value. */ unsigned int default_port : 4; /* Last dev->if_port value. */
unsigned int have_thread : 1;
spinlock_t lock; spinlock_t lock;
spinlock_t rx_lock; spinlock_t rx_lock;
chip_t chipset; chip_t chipset;
@ -594,7 +595,6 @@ struct rtl8139_private {
struct rtl_extra_stats xstats; struct rtl_extra_stats xstats;
struct work_struct thread; struct work_struct thread;
long time_to_die; /* -1 no thr, 0 thr active, 1 thr cancel */
struct mii_if_info mii; struct mii_if_info mii;
unsigned int regs_len; unsigned int regs_len;
@ -1599,40 +1599,33 @@ static void rtl8139_thread (void *_data)
struct net_device *dev = _data; struct net_device *dev = _data;
struct rtl8139_private *tp = netdev_priv(dev); struct rtl8139_private *tp = netdev_priv(dev);
if ((tp->time_to_die == 0) && if (rtnl_lock_interruptible() == 0) {
(rtnl_lock_interruptible() == 0)) {
rtl8139_thread_iter (dev, tp, tp->mmio_addr); rtl8139_thread_iter (dev, tp, tp->mmio_addr);
rtnl_unlock (); rtnl_unlock ();
} }
if (tp->time_to_die == 0) schedule_delayed_work(&tp->thread, next_tick);
schedule_delayed_work(&tp->thread, next_tick);
} }
static void rtl8139_start_thread(struct rtl8139_private *tp) static void rtl8139_start_thread(struct rtl8139_private *tp)
{ {
tp->twistie = 0; tp->twistie = 0;
tp->time_to_die = -1;
if (tp->chipset == CH_8139_K) if (tp->chipset == CH_8139_K)
tp->twistie = 1; tp->twistie = 1;
else if (tp->drv_flags & HAS_LNK_CHNG) else if (tp->drv_flags & HAS_LNK_CHNG)
return; return;
tp->time_to_die = 0; tp->have_thread = 1;
schedule_delayed_work(&tp->thread, next_tick); schedule_delayed_work(&tp->thread, next_tick);
} }
static void rtl8139_stop_thread(struct rtl8139_private *tp) static void rtl8139_stop_thread(struct rtl8139_private *tp)
{ {
if (tp->time_to_die < 0) if (tp->have_thread) {
return; cancel_rearming_delayed_work(&tp->thread);
tp->have_thread = 0;
tp->time_to_die = 1; }
wmb();
if (cancel_delayed_work(&tp->thread) == 0)
flush_scheduled_work();
} }
static inline void rtl8139_tx_clear (struct rtl8139_private *tp) static inline void rtl8139_tx_clear (struct rtl8139_private *tp)