diff options
| author | James Morris <jmorris@namei.org> | 2008-08-27 20:47:34 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2008-08-27 20:47:34 -0400 |
| commit | 86d688984deefa3ae5a802880c11f2b408b5d6cf (patch) | |
| tree | 7ea5e8189b0a774626d3ed7c3c87df2495a4c4a0 /drivers/net/xen-netfront.c | |
| parent | 93c06cbbf9fea5d5be1778febb7fa9ab1a74e5f5 (diff) | |
| parent | 4c246edd2550304df5b766cc841584b2bb058843 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'drivers/net/xen-netfront.c')
| -rw-r--r-- | drivers/net/xen-netfront.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c index 902bbe788215..c749bdba214c 100644 --- a/drivers/net/xen-netfront.c +++ b/drivers/net/xen-netfront.c | |||
| @@ -329,7 +329,7 @@ static int xennet_open(struct net_device *dev) | |||
| 329 | } | 329 | } |
| 330 | spin_unlock_bh(&np->rx_lock); | 330 | spin_unlock_bh(&np->rx_lock); |
| 331 | 331 | ||
| 332 | xennet_maybe_wake_tx(dev); | 332 | netif_start_queue(dev); |
| 333 | 333 | ||
| 334 | return 0; | 334 | return 0; |
| 335 | } | 335 | } |