diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-10-30 16:16:56 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-10-30 16:16:56 -0400 |
| commit | f1e095f1d206b81b44160f41278ce5c78641e9b7 (patch) | |
| tree | bd293d46d2d3e4cdf435a22ddb2877c6ba1b8acc /drivers/net/xen-netfront.c | |
| parent | b0438a1b71955c425c304a2a483765ef24841766 (diff) | |
| parent | 1792f17b7210280a3d7ff29da9614ba779cfcedb (diff) | |
Merge branch 'master' into for-next
Diffstat (limited to 'drivers/net/xen-netfront.c')
| -rw-r--r-- | drivers/net/xen-netfront.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c index 630fb8664768..458bb57914a3 100644 --- a/drivers/net/xen-netfront.c +++ b/drivers/net/xen-netfront.c | |||
| @@ -1610,6 +1610,8 @@ static void netback_changed(struct xenbus_device *dev, | |||
| 1610 | switch (backend_state) { | 1610 | switch (backend_state) { |
| 1611 | case XenbusStateInitialising: | 1611 | case XenbusStateInitialising: |
| 1612 | case XenbusStateInitialised: | 1612 | case XenbusStateInitialised: |
| 1613 | case XenbusStateReconfiguring: | ||
| 1614 | case XenbusStateReconfigured: | ||
| 1613 | case XenbusStateConnected: | 1615 | case XenbusStateConnected: |
| 1614 | case XenbusStateUnknown: | 1616 | case XenbusStateUnknown: |
| 1615 | case XenbusStateClosed: | 1617 | case XenbusStateClosed: |