From: Mark Lord <mlord@pobox•com>
To: Sarah Sharp <sarah.a.sharp@linux•intel.com>,
David Laight <David.Laight@ACULAB•COM>
Cc: David Miller <davem@davemloft•net>,
eric.dumazet@gmail•com, ming.lei@canonical•com,
netdev@vger•kernel.org, linux-usb@vger•kernel.org
Subject: Re: net/usb/ax88179_178a driver broken in linux-3.12
Date: Fri, 29 Nov 2013 21:58:51 -0500 [thread overview]
Message-ID: <5299546B.2020800@pobox.com> (raw)
In-Reply-To: <20131120165420.GD9611@xanatos>
On 13-11-19 08:44 AM, Mark Lord wrote:
> On 13-11-19 05:04 AM, David Laight wrote:
>>
>> Which changes did you revert?
>
> Just the bits that changed how the headroom/tailroom sizes
> were checked and adjusted. See attachment for the revert patch
> I am using here. My mailer unfortunately likes to mangle inline patches.
>
> =========snip===========
> Revert USB 3.0 network driver changes that break the adapter (lockups)
> in 3.12. This just puts back the original code from previous kernels.
>
> Signed-off-by: Mark Lord <mlord@pobox•com>
>
> --- linux/drivers/net/usb/ax88179_178a.c.orig 2013-11-03 18:41:51.000000000 -0500
> +++ linux/drivers/net/usb/ax88179_178a.c 2013-11-17 13:23:39.525734277 -0500
> @@ -1177,18 +1177,31 @@
> int frame_size = dev->maxpacket;
> int mss = skb_shinfo(skb)->gso_size;
> int headroom;
> + int tailroom;
>
> tx_hdr1 = skb->len;
> tx_hdr2 = mss;
> if (((skb->len + 8) % frame_size) == 0)
> tx_hdr2 |= 0x80008000; /* Enable padding */
>
> - headroom = skb_headroom(skb) - 8;
> + headroom = skb_headroom(skb);
> + tailroom = skb_tailroom(skb);
>
> - if ((skb_header_cloned(skb) || headroom < 0) &&
> - pskb_expand_head(skb, headroom < 0 ? 8 : 0, 0, GFP_ATOMIC)) {
> + if (!skb_header_cloned(skb) &&
> + !skb_cloned(skb) &&
> + (headroom + tailroom) >= 8) {
> + if (headroom < 8) {
> + skb->data = memmove(skb->head + 8, skb->data, skb->len);
> + skb_set_tail_pointer(skb, skb->len);
> + }
> + } else {
> + struct sk_buff *skb2;
> +
> + skb2 = skb_copy_expand(skb, 8, 0, flags);
> dev_kfree_skb_any(skb);
> - return NULL;
> + skb = skb2;
> + if (!skb)
> + return NULL;
> }
>
> skb_push(skb, 4);
>
Two kernels later, and this regression has still not been fixed.
A simple revert, folks.
--
Mark Lord
Real-Time Remedies Inc.
mlord@pobox•com
next prev parent reply other threads:[~2013-11-30 2:58 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <52890C7E.6000607@pobox.com>
2013-11-17 18:56 ` net/usb/ax88179_178a driver broken in linux-3.12 Mark Lord
2013-11-17 19:04 ` Mark Lord
2013-11-18 10:12 ` David Laight
2013-11-18 13:32 ` David Laight
2013-11-18 22:52 ` Mark Lord
2013-11-19 10:04 ` David Laight
2013-11-19 13:44 ` Mark Lord
2013-11-19 13:56 ` David Laight
2013-11-19 14:02 ` Mark Lord
2013-11-19 14:15 ` Eric Dumazet
2013-11-19 14:24 ` Mark Lord
2013-11-19 14:43 ` David Laight
2013-11-19 16:10 ` Eric Dumazet
2013-11-19 16:26 ` David Laight
2013-11-19 21:13 ` David Miller
2013-11-20 9:54 ` David Laight
2013-11-20 16:54 ` Sarah Sharp
2013-11-30 2:58 ` Mark Lord [this message]
[not found] ` <5299546B.2020800-e+AXbWqSrlAAvxtiuMwx3w@public.gmane.org>
2013-12-02 9:30 ` David Laight
2013-12-02 15:05 ` Mark Lord
[not found] ` <529CA1D2.2070806-e+AXbWqSrlAAvxtiuMwx3w@public.gmane.org>
2013-12-02 19:08 ` Sarah Sharp
2013-12-02 19:11 ` Mark Lord
2013-12-02 19:18 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5299546B.2020800@pobox.com \
--to=mlord@pobox$(echo .)com \
--cc=David.Laight@ACULAB$(echo .)COM \
--cc=davem@davemloft$(echo .)net \
--cc=eric.dumazet@gmail$(echo .)com \
--cc=linux-usb@vger$(echo .)kernel.org \
--cc=ming.lei@canonical$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
--cc=sarah.a.sharp@linux$(echo .)intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox