Merge branch 'r8169-improvements-for-scheduled-task-handling' (c64797d4) · Commits · 戴 / test

drivers/net/ethernet/realtek/r8169_main.c

+6 −21

Original line number	Diff line number	Diff line
		@@ -2228,7 +2228,7 @@ u16 rtl8168h_2_get_adc_bias_ioffset(struct rtl8169_private *tp)

		static void rtl_schedule_task(struct rtl8169_private *tp, enum rtl_flag flag)
		{
		if (!test_and_set_bit(flag, tp->wk.flags))
		set_bit(flag, tp->wk.flags);
		schedule_work(&tp->wk.work);
		}

		@@ -4575,8 +4575,7 @@ static irqreturn_t rtl8169_interrupt(int irq, void *dev_instance)
		if (unlikely(status & RxFIFOOver &&
		tp->mac_version == RTL_GIGA_MAC_VER_11)) {
		netif_stop_queue(tp->dev);
		/* XXX - Hack alert. See rtl_task(). */
		set_bit(RTL_FLAG_TASK_RESET_PENDING, tp->wk.flags);
		rtl_schedule_task(tp, RTL_FLAG_TASK_RESET_PENDING);
		}

		rtl_irq_disable(tp);
		@@ -4589,31 +4588,17 @@ out:

		static void rtl_task(struct work_struct *work)
		{
		static const struct {
		int bitnr;
		void (action)(struct rtl8169_private );
		} rtl_work[] = {
		{ RTL_FLAG_TASK_RESET_PENDING, rtl_reset_work },
		};
		struct rtl8169_private *tp =
		container_of(work, struct rtl8169_private, wk.work);
		struct net_device *dev = tp->dev;
		int i;

		rtl_lock_work(tp);

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

		for (i = 0; i < ARRAY_SIZE(rtl_work); i++) {
		bool pending;

		pending = test_and_clear_bit(rtl_work[i].bitnr, tp->wk.flags);
		if (pending)
		rtl_work[i].action(tp);
		}

		if (test_and_clear_bit(RTL_FLAG_TASK_RESET_PENDING, tp->wk.flags))
		rtl_reset_work(tp);
		out_unlock:
		rtl_unlock_work(tp);
		}