Re: My system stops during startup with curretn git tree of 2.6.25-rc2

Laszlo Attila Toth
2008-02-18T17:03:58Z

Hello,

Rafael J. Wysocki wrote:
> On Monday, 18 of February 2008, Laszlo Attila Toth wrote:
>
>
> All in all, I gather you wanted me to test the patch below. :-)
>
> Yes, that helps.

Thanks for the testing. Dave already reverted the patch, also I don't
know I should resend it or leave it as is.

Regards,
Attila

> Thanks,
> Rafael
>
> ---
> Fix net/core/rtnetlink.c breakage caused by commit
> 45b503548210fe6f23e92b856421c2a3f05fd034
> "[RTNETLINK]: Send a single notification on device state changes."
>
> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
> ---
> net/core/rtnetlink.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> Index: linux-2.6/net/core/rtnetlink.c
> ===================================================================
> --- linux-2.6.orig/net/core/rtnetlink.c
> +++ linux-2.6/net/core/rtnetlink.c
> @@ -853,7 +853,7 @@ static int do_setlink(struct net_device
> if (dev->link_mode != nla_get_u8(tb[IFLA_LINKMODE])) {
> write_lock_bh(&dev_base_lock);
> dev->link_mode = nla_get_u8(tb[IFLA_LINKMODE]);
> - write_lock_bh(&dev_base_lock);
> + write_unlock_bh(&dev_base_lock);
> modified = 1;
> }
> }
> @@ -870,8 +870,8 @@ errout:
> if (send_addr_notify)
> call_netdevice_notifiers(NETDEV_CHANGEADDR, dev);
>
> - if (modified)
> - netdev_state_change(dev);
> + if (modified && dev->flags & IFF_UP)
> + call_netdevice_notifiers(NETDEV_CHANGE, dev);
>
> return err;
> }
>