Skip to content

Commit

Permalink
r8169: move task enable boolean to bitfield.
Browse files Browse the repository at this point in the history
Simpler, more consistent, with negligible cost in non-critical paths.

Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Suggested-by: Michał Mirosław <mirqus@gmail.com>
Cc: Hayes Wang <hayeswang@realtek.com>
  • Loading branch information
Francois Romieu committed Jan 31, 2012
1 parent 98ddf98 commit 6c4a70c
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions drivers/net/ethernet/realtek/r8169.c
Original file line number Diff line number Diff line change
Expand Up @@ -668,6 +668,7 @@ struct rtl8169_counters {
};

enum rtl_flag {
RTL_FLAG_TASK_ENABLED,
RTL_FLAG_TASK_SLOW_PENDING,
RTL_FLAG_TASK_RESET_PENDING,
RTL_FLAG_TASK_PHY_PENDING,
Expand Down Expand Up @@ -725,7 +726,6 @@ struct rtl8169_private {
DECLARE_BITMAP(flags, RTL_FLAG_MAX);
struct mutex mutex;
struct work_struct work;
bool enabled;
} wk;

unsigned features;
Expand Down Expand Up @@ -4352,7 +4352,7 @@ static int rtl8169_open(struct net_device *dev)

rtl_lock_work(tp);

tp->wk.enabled = true;
set_bit(RTL_FLAG_TASK_ENABLED, tp->wk.flags);

napi_enable(&tp->napi);

Expand Down Expand Up @@ -5879,7 +5879,8 @@ static void rtl_task(struct work_struct *work)

rtl_lock_work(tp);

if (!netif_running(dev) || !tp->wk.enabled)
if (!netif_running(dev) ||
!test_bit(RTL_FLAG_TASK_ENABLED, tp->wk.flags))
goto out_unlock;

for (i = 0; i < ARRAY_SIZE(rtl_work); i++) {
Expand Down Expand Up @@ -5977,7 +5978,7 @@ static int rtl8169_close(struct net_device *dev)
rtl8169_update_counters(dev);

rtl_lock_work(tp);
tp->wk.enabled = false;
clear_bit(RTL_FLAG_TASK_ENABLED, tp->wk.flags);

rtl8169_down(dev);
rtl_unlock_work(tp);
Expand Down Expand Up @@ -6076,7 +6077,7 @@ static void rtl8169_net_suspend(struct net_device *dev)

rtl_lock_work(tp);
napi_disable(&tp->napi);
tp->wk.enabled = false;
clear_bit(RTL_FLAG_TASK_ENABLED, tp->wk.flags);
rtl_unlock_work(tp);

rtl_pll_power_down(tp);
Expand All @@ -6102,7 +6103,7 @@ static void __rtl8169_resume(struct net_device *dev)

rtl_pll_power_up(tp);

tp->wk.enabled = true;
set_bit(RTL_FLAG_TASK_ENABLED, tp->wk.flags);

rtl_schedule_task(tp, RTL_FLAG_TASK_RESET_PENDING);
}
Expand Down

0 comments on commit 6c4a70c

Please sign in to comment.