From: Toshiaki Makita <makita.toshiaki@lab•ntt.co.jp>
To: Cong Wang <cwang@twopensource•com>
Cc: Stephen Hemminger <stephen@networkplumber•org>,
netdev <netdev@vger•kernel.org>
Subject: Re: Fw: [Bug 70071] New: Sending netconsole messages over a bridged network interface doesn't work anymore
Date: Thu, 06 Feb 2014 14:44:44 +0900 [thread overview]
Message-ID: <52F3214C.4060308@lab.ntt.co.jp> (raw)
In-Reply-To: <CAHA+R7Pf1q7+xyqpwmGPToa0fTGn6dmukLvyncWwYAP-F_JvLg@mail.gmail.com>
(2014/02/06 14:05), Cong Wang wrote:
> On Wed, Feb 5, 2014 at 7:58 PM, Toshiaki Makita
> <makita.toshiaki@lab•ntt.co.jp> wrote:
>> (2014/02/06 6:15), Stephen Hemminger wrote:
>>>
>>>
>>> Begin forwarded message:
>>>
>>> Date: Wed, 5 Feb 2014 04:36:03 -0800
>>> From: "bugzilla-daemon@bugzilla•kernel.org" <bugzilla-daemon@bugzilla•kernel.org>
>>> To: "stephen@networkplumber•org" <stephen@networkplumber•org>
>>> Subject: [Bug 70071] New: Sending netconsole messages over a bridged network interface doesn't work anymore
>>
>> Reverting this commit seems to fix the problem.
>> 93d8bf9fb8f3 ("bridge: cleanup netpoll code")
>>
>> In the following code path, p->br->dev->npinfo is NULL at
>> br_netpoll_enable() because __netpoll_setup() assigns ndev->npinfo after
>> calling ndo_netpoll_setup().
>>
>> __netpoll_setup() -> br_netpoll_setup() -> br_netpoll_enable()
>
> Yeah, looks like we can just remove that incorrect 'if'.
> Please test the following patch.
>
> diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c
> index e4401a5..bb2b706 100644
> --- a/net/bridge/br_device.c
> +++ b/net/bridge/br_device.c
> @@ -254,9 +254,6 @@ int br_netpoll_enable(struct net_bridge_port *p, gfp_t gfp)
> struct netpoll *np;
> int err;
>
> - if (!p->br->dev->npinfo)
> - return 0;
> -
> np = kzalloc(sizeof(*p->np), gfp);
> if (!np)
> return -ENOMEM;
Tested this patch with latest net-tree and netconsole works with it.
But I thinks it is better to move that "if" to br_add_if() because if we
don't have npinfo, we don't have to alloc p->np in br_add_if(), right?
Thanks,
Toshiaki Makita
next prev parent reply other threads:[~2014-02-06 5:45 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-05 21:15 Fw: [Bug 70071] New: Sending netconsole messages over a bridged network interface doesn't work anymore Stephen Hemminger
2014-02-06 0:36 ` Cong Wang
2014-02-06 3:58 ` Toshiaki Makita
2014-02-06 5:05 ` Cong Wang
2014-02-06 5:44 ` Toshiaki Makita [this message]
2014-02-06 6:49 ` Cong Wang
2014-02-06 8:52 ` Toshiaki Makita
2014-02-06 22:18 ` Cong Wang
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=52F3214C.4060308@lab.ntt.co.jp \
--to=makita.toshiaki@lab$(echo .)ntt.co.jp \
--cc=cwang@twopensource$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
--cc=stephen@networkplumber$(echo .)org \
/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