From: Johannes Berg <johannes@sipsolutions.net>
To: Eric Dumazet <edumazet@google.com>
Cc: artem.bityutskiy@linux.intel.com, linux-wireless@vger.kernel.org,
netdev <netdev@vger.kernel.org>
Subject: Re: regression: tethering fails in 3.5 with iwlwifi
Date: Thu, 20 Sep 2012 14:47:49 +0200 [thread overview]
Message-ID: <1348145269.4161.28.camel@jlt4.sipsolutions.net> (raw)
In-Reply-To: <CANn89iKStHAwVZtpgQMzEpByGYG2FKpjSQsJFT-9qQmjw+KJ8g@mail.gmail.com> (sfid-20120920_144505_999408_BB063E95)
On Thu, 2012-09-20 at 14:45 +0200, Eric Dumazet wrote:
> I guess you only need to make sure 14 bytes of ethernet header are
> available before eth_type_trans(skb, dev);
>
> diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
> index 61c621e..ffe5f84 100644
> --- a/net/mac80211/rx.c
> +++ b/net/mac80211/rx.c
> @@ -1795,9 +1795,13 @@ ieee80211_deliver_skb(struct ieee80211_rx_data *rx)
>
> if (skb) {
> /* deliver to local stack */
> - skb->protocol = eth_type_trans(skb, dev);
> - memset(skb->cb, 0, sizeof(skb->cb));
> - netif_receive_skb(skb);
> + if (pskb_may_pull(skb, sizeof(struct ethhdr))) {
> + skb->protocol = eth_type_trans(skb, dev);
> + memset(skb->cb, 0, sizeof(skb->cb));
> + netif_receive_skb(skb);
> + } else {
> + kfree_skb(skb);
> + }
> }
> }
Yeah I was looking at the same code just now. However, we had actually
inserted the skb_linearize() *after* eth_type_trans(), so I'm confused.
Maybe it still works, more or less by accident?
johannes
next prev parent reply other threads:[~2012-09-20 12:47 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1347361823.26457.3.camel@sauron.fi.intel.com>
[not found] ` <1DC40B07CD6EC041A66726C271A73AE6195AE9C8@IRSMSX102.ger.corp.intel.com>
2012-09-14 14:02 ` regression: tethering fails in 3.5 with iwlwifi Artem Bityutskiy
2012-09-14 16:39 ` Artem Bityutskiy
2012-09-17 14:41 ` Artem Bityutskiy
2012-09-17 15:15 ` Eric Dumazet
2012-09-17 15:17 ` Johannes Berg
2012-09-18 7:09 ` Johannes Berg
2012-09-18 8:40 ` Artem Bityutskiy
2012-09-18 8:44 ` Johannes Berg
2012-09-18 11:45 ` Johannes Berg
2012-09-18 13:20 ` Artem Bityutskiy
2012-09-20 12:06 ` Artem Bityutskiy
2012-09-20 12:35 ` Johannes Berg
2012-09-20 12:40 ` Eric Dumazet
2012-09-20 12:45 ` Eric Dumazet
2012-09-20 12:46 ` Eric Dumazet
2012-09-20 12:50 ` Johannes Berg
2012-09-20 12:47 ` Johannes Berg [this message]
2012-09-20 12:48 ` Eric Dumazet
2012-09-20 12:50 ` Johannes Berg
2012-09-20 12:51 ` Eric Dumazet
2012-09-20 12:54 ` Johannes Berg
2012-09-20 12:51 ` Johannes Berg
2012-09-20 12:58 ` Artem Bityutskiy
2012-09-20 13:04 ` Eric Dumazet
2012-09-20 13:15 ` Eric Dumazet
2012-09-20 13:22 ` Artem Bityutskiy
2012-09-20 13:22 ` Eric Dumazet
2012-09-20 13:39 ` Artem Bityutskiy
2012-09-20 13:41 ` Eric Dumazet
2012-09-20 14:25 ` Eric Dumazet
2012-09-20 14:37 ` Artem Bityutskiy
2012-09-20 14:56 ` Eric Dumazet
2012-09-20 15:05 ` Johannes Berg
2012-09-20 15:18 ` Eric Dumazet
2012-09-20 15:22 ` Johannes Berg
2012-09-20 15:27 ` Eric Dumazet
2012-09-20 15:31 ` Eric Dumazet
2012-09-20 15:32 ` Eric Dumazet
2012-09-20 15:19 ` Eric Dumazet
2012-09-20 15:26 ` Johannes Berg
2012-09-20 15:09 ` Artem Bityutskiy
2012-09-21 17:24 ` David Miller
2012-09-20 12:47 ` Johannes Berg
2013-03-21 19:34 ` Johannes Berg
2013-03-21 21:24 ` David Miller
2013-03-22 7:01 ` Artem Bityutskiy
2013-03-23 15:45 ` Luis Henriques
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=1348145269.4161.28.camel@jlt4.sipsolutions.net \
--to=johannes@sipsolutions.net \
--cc=artem.bityutskiy@linux.intel.com \
--cc=edumazet@google.com \
--cc=linux-wireless@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).