r8169: avoid a useless work scheduling.
authorFrancois Romieu <romieu@fr.zoreil.com>
Tue, 31 Jan 2012 10:09:21 +0000 (11:09 +0100)
committerFrancois Romieu <romieu@fr.zoreil.com>
Tue, 31 Jan 2012 13:32:44 +0000 (14:32 +0100)
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Suggested-by: Michał Mirosław <mirqus@gmail.com>
Cc: Hayes Wang <hayeswang@realtek.com>
drivers/net/ethernet/realtek/r8169.c

index 679711e4c3c40e464940a3d2dabf00c6d30360d5..0377ffaa8bee62c52499d4388becce044c8c3edb 100644 (file)
@@ -5843,7 +5843,8 @@ static void rtl_slow_event_work(struct rtl8169_private *tp)
                /* Work around for rx fifo overflow */
                case RTL_GIGA_MAC_VER_11:
                        netif_stop_queue(dev);
-                       rtl_schedule_task(tp, RTL_FLAG_TASK_RESET_PENDING);
+                       /* XXX - Hack alert. See rtl_task(). */
+                       set_bit(RTL_FLAG_TASK_RESET_PENDING, tp->wk.flags);
                default:
                        break;
                }
@@ -5868,6 +5869,7 @@ static void rtl_task(struct work_struct *work)
                int bitnr;
                void (*action)(struct rtl8169_private *);
        } rtl_work[] = {
+               /* XXX - keep rtl_slow_event_work() as first element. */
                { RTL_FLAG_TASK_SLOW_PENDING,   rtl_slow_event_work },
                { RTL_FLAG_TASK_RESET_PENDING,  rtl_reset_work },
                { RTL_FLAG_TASK_PHY_PENDING,    rtl_phy_work }