3.6.11.4 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Stefan Bader <[email protected]>
[ Upstream commit e5195c1f31f399289347e043d6abf3ffa80f0005 ]
Signed-off-by: Stefan Bader <[email protected]>
Acked-by: Francois Romieu <[email protected]>
Cc: hayeswang <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
Signed-off-by: Steven Rostedt <[email protected]>
---
drivers/net/ethernet/realtek/r8169.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index 886b52f..74ca124 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -5806,6 +5806,14 @@ static netdev_tx_t rtl8169_start_xmit(struct sk_buff *skb,
goto err_stop_0;
}
+ /* 8168evl does not automatically pad to minimum length. */
+ if (unlikely(tp->mac_version == RTL_GIGA_MAC_VER_34 &&
+ skb->len < ETH_ZLEN)) {
+ if (skb_padto(skb, ETH_ZLEN))
+ goto err_update_stats;
+ skb_put(skb, ETH_ZLEN - skb->len);
+ }
+
if (unlikely(le32_to_cpu(txd->opts1) & DescOwn))
goto err_stop_0;
@@ -5877,6 +5885,7 @@ err_dma_1:
rtl8169_unmap_tx_skb(d, tp->tx_skb + entry, txd);
err_dma_0:
dev_kfree_skb(skb);
+err_update_stats:
dev->stats.tx_dropped++;
return NETDEV_TX_OK;
--
1.7.10.4
Steven Rostedt <[email protected]> :
> 3.6.11.4 stable review patch.
> If anyone has any objections, please let me know.
You should postpone it until the fix for a regression it induces when
user enable Tx checksumming is merged.
--
Ueimor
On Sat, 2013-05-18 at 12:02 +0200, Francois Romieu wrote:
> Steven Rostedt <[email protected]> :
> > 3.6.11.4 stable review patch.
> > If anyone has any objections, please let me know.
>
> You should postpone it until the fix for a regression it induces when
> user enable Tx checksumming is merged.
>
What do you mean? This has already been incorporated into 3.2, 3.4, 3.8,
and 3.9 stable trees. Or has it just been recently found that this
introduces a regression?
I can pull this out for this release.
(this was upstream commit: e5195c1f31f399289347e043d6abf3ffa80f0005)
Thanks,
-- Steve
From: Steven Rostedt <[email protected]>
Date: Mon, 20 May 2013 15:40:44 -0400
> On Sat, 2013-05-18 at 12:02 +0200, Francois Romieu wrote:
>> Steven Rostedt <[email protected]> :
>> > 3.6.11.4 stable review patch.
>> > If anyone has any objections, please let me know.
>>
>> You should postpone it until the fix for a regression it induces when
>> user enable Tx checksumming is merged.
>>
>
> What do you mean? This has already been incorporated into 3.2, 3.4, 3.8,
> and 3.9 stable trees. Or has it just been recently found that this
> introduces a regression?
>
> I can pull this out for this release.
>
> (this was upstream commit: e5195c1f31f399289347e043d6abf3ffa80f0005)
This patch causes a new regression, which is only fixed in my 'net'
tree at this time.
On Mon, 2013-05-20 at 12:45 -0700, David Miller wrote:
> From: Steven Rostedt <[email protected]>
> Date: Mon, 20 May 2013 15:40:44 -0400
>
> > On Sat, 2013-05-18 at 12:02 +0200, Francois Romieu wrote:
> >> Steven Rostedt <[email protected]> :
> >> > 3.6.11.4 stable review patch.
> >> > If anyone has any objections, please let me know.
> >>
> >> You should postpone it until the fix for a regression it induces when
> >> user enable Tx checksumming is merged.
> >>
> >
> > What do you mean? This has already been incorporated into 3.2, 3.4, 3.8,
> > and 3.9 stable trees. Or has it just been recently found that this
> > introduces a regression?
> >
> > I can pull this out for this release.
> >
> > (this was upstream commit: e5195c1f31f399289347e043d6abf3ffa80f0005)
>
> This patch causes a new regression, which is only fixed in my 'net'
> tree at this time.
Thanks for the quick response. I'll drop it from 3.6.11.4.
-- Steve
On Sat, 2013-05-18 at 12:02 +0200, Francois Romieu wrote:
> Steven Rostedt <[email protected]> :
> > 3.6.11.4 stable review patch.
> > If anyone has any objections, please let me know.
>
> You should postpone it until the fix for a regression it induces when
> user enable Tx checksumming is merged.
>
I'm working on 3.6.11.5. Has the fix for the regression been pulled into
mainline yet, and if so, what's the commit SHA1?
Thanks,
-- Steve
Steven Rostedt <[email protected]> :
[...]
> I'm working on 3.6.11.5. Has the fix for the regression been pulled into
> mainline yet, and if so, what's the commit SHA1?
It's in mainline as b423e9ae49d78ea3f53b131c8d5a6087aed16fd6 but davem
has not sent it into -stable yet.
--
Ueimor
On Thu, 2013-05-30 at 23:00 +0200, Francois Romieu wrote:
> Steven Rostedt <[email protected]> :
> [...]
> > I'm working on 3.6.11.5. Has the fix for the regression been pulled into
> > mainline yet, and if so, what's the commit SHA1?
>
> It's in mainline as b423e9ae49d78ea3f53b131c8d5a6087aed16fd6 but davem
> has not sent it into -stable yet.
>
Thanks! I'll keep a look out for when it arrives in stable.
-- Steve