bridge: fix netconsole setup over bridge
authorCong Wang <cwang@twopensource.com>
Thu, 6 Feb 2014 23:00:52 +0000 (15:00 -0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 7 Feb 2014 05:28:06 +0000 (21:28 -0800)
commitdbe173079ab58a444e12dbebe96f5aec1e0bed1a
tree99e3267bb0bf26cbcadc15dae0431d29f1a2f765
parented98df3361f059db42786c830ea96e2d18b8d4db
bridge: fix netconsole setup over bridge

Commit 93d8bf9fb8f3 ("bridge: cleanup netpoll code") introduced
a check in br_netpoll_enable(), but this check is incorrect for
br_netpoll_setup(). This patch moves the code after the check
into __br_netpoll_enable() and calls it in br_netpoll_setup().
For br_add_if(), the check is still needed.

Fixes: 93d8bf9fb8f3 ("bridge: cleanup netpoll code")
Cc: Toshiaki Makita <makita.toshiaki@lab.ntt.co.jp>
Cc: Stephen Hemminger <stephen@networkplumber.org>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Cong Wang <cwang@twopensource.com>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Acked-by: Toshiaki Makita <makita.toshiaki@lab.ntt.co.jp>
Tested-by: Toshiaki Makita <makita.toshiaki@lab.ntt.co.jp>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/bridge/br_device.c