This is a note to let you know that I've just added the patch titled r8169: missing barriers.
to the 3.0-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: r8169-missing-barriers.patch and it can be found in the queue-3.0 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@vger.kernel.org> know about it. >From stable-ow...@vger.kernel.org Sat Oct 6 06:49:21 2012 From: Francois Romieu <rom...@fr.zoreil.com> Date: Fri, 5 Oct 2012 23:29:16 +0200 Subject: r8169: missing barriers. To: stable@vger.kernel.org Cc: Hayes Wang <hayesw...@realtek.com>, Jonathan Nieder <jrnie...@gmail.com> commit 1e874e041fc7c222cbd85b20c4406070be1f687a upstream. Signed-off-by: Francois Romieu <rom...@fr.zoreil.com> Cc: Hayes Wang <hayesw...@realtek.com> Reviewed-by: Jonathan Nieder <jrnie...@gmail.com> Acked-by: David S. Miller <da...@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org> --- drivers/net/r8169.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) --- a/drivers/net/r8169.c +++ b/drivers/net/r8169.c @@ -4957,7 +4957,7 @@ static netdev_tx_t rtl8169_start_xmit(st if (TX_BUFFS_AVAIL(tp) < MAX_SKB_FRAGS) { netif_stop_queue(dev); - smp_rmb(); + smp_mb(); if (TX_BUFFS_AVAIL(tp) >= MAX_SKB_FRAGS) netif_wake_queue(dev); } @@ -5058,7 +5058,7 @@ static void rtl8169_tx_interrupt(struct if (tp->dirty_tx != dirty_tx) { tp->dirty_tx = dirty_tx; - smp_wmb(); + smp_mb(); if (netif_queue_stopped(dev) && (TX_BUFFS_AVAIL(tp) >= MAX_SKB_FRAGS)) { netif_wake_queue(dev); @@ -5069,7 +5069,6 @@ static void rtl8169_tx_interrupt(struct * of start_xmit activity is detected (if it is not detected, * it is slow enough). -- FR */ - smp_rmb(); if (tp->cur_tx != dirty_tx) RTL_W8(TxPoll, NPQ); } Patches currently in stable-queue which might be from rom...@fr.zoreil.com are queue-3.0/r8169-fix-config2-msienable-bit-setting.patch queue-3.0/r8169-remove-erroneous-processing-of-always-set-bit.patch queue-3.0/r8169-fix-wake-on-lan-setting-for-non-8111e.patch queue-3.0/r8169-8168c-and-later-require-bit-0x20-to-be-set-in-config2-for-pme-signaling.patch queue-3.0/r8169-config1-is-read-only-on-8168c-and-later.patch queue-3.0/r8169-rx-fifo-overflow-fixes.patch queue-3.0/r8169-jumbo-fixes.patch queue-3.0/r8169-runtime-resume-before-shutdown.patch queue-3.0/r8169-increase-the-delay-parameter-of-pm_schedule_suspend.patch queue-3.0/r8169-don-t-enable-rx-when-shutdown.patch queue-3.0/r8169-missing-barriers.patch queue-3.0/r8169-fix-unsigned-int-wraparound-with-tso.patch queue-3.0/r8169-expand-received-packet-length-indication.patch queue-3.0/r8169-call-netif_napi_del-at-errpaths-and-at-driver-unload.patch -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html