diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-15 12:15:17 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-15 12:15:17 -0400 |
| commit | f3efbe582b5396d134024c03a5fa253f2a85d9a6 (patch) | |
| tree | e4e15b7567b82d24cb1e7327398286a2b88df04c /drivers/net/xen-netfront.c | |
| parent | 05d3ed0a1fe3ea05ab9f3b8d32576a0bc2e19660 (diff) | |
| parent | b635acec48bcaa9183fcbf4e3955616b0d4119b5 (diff) | |
Merge branch 'linus' into x86/gart
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 | } |