diff options
| author | Michal Marek <mmarek@suse.cz> | 2010-10-12 09:09:06 -0400 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2010-10-12 09:09:06 -0400 |
| commit | 239060b93bb30a4ad55f1ecaa512464a035cc5ba (patch) | |
| tree | 77f79810e57d4fc24356eca0cd6db463e8994128 /drivers/net/xen-netfront.c | |
| parent | 1408b15b98635a13bad2e2a50b3c2ae2ccdf625b (diff) | |
| parent | e9203c988234aa512bd45ca32b52e21c7bbfc414 (diff) | |
Merge branch 'kbuild/rc-fixes' into kbuild/kconfig
We need to revert the temporary hack in 71ebc01, hence the merge.
Diffstat (limited to 'drivers/net/xen-netfront.c')
| -rw-r--r-- | drivers/net/xen-netfront.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c index d504e2b60257..b50fedcef8ac 100644 --- a/drivers/net/xen-netfront.c +++ b/drivers/net/xen-netfront.c | |||
| @@ -1621,6 +1621,7 @@ static void backend_changed(struct xenbus_device *dev, | |||
| 1621 | if (xennet_connect(netdev) != 0) | 1621 | if (xennet_connect(netdev) != 0) |
| 1622 | break; | 1622 | break; |
| 1623 | xenbus_switch_state(dev, XenbusStateConnected); | 1623 | xenbus_switch_state(dev, XenbusStateConnected); |
| 1624 | netif_notify_peers(netdev); | ||
| 1624 | break; | 1625 | break; |
| 1625 | 1626 | ||
| 1626 | case XenbusStateClosing: | 1627 | case XenbusStateClosing: |