diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-01-12 00:37:42 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-01-12 00:37:42 -0500 |
| commit | 83eb95b852902f952ba594447a796ad8146b9462 (patch) | |
| tree | 33c199aeeae58b69ad8d6d2a33c2d96ba2b98ddf /drivers/net/xen-netfront.c | |
| parent | efb3e34b6176d30c4fe8635fa8e1beb6280cc2cd (diff) | |
| parent | 9bbe7b984096ac45586da2adf26c14069ecb79b2 (diff) | |
Merge branch 'sh/sdio' into sh-latest
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 cdbeec9f83ea..546de5749824 100644 --- a/drivers/net/xen-netfront.c +++ b/drivers/net/xen-netfront.c | |||
| @@ -488,7 +488,7 @@ static int xennet_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
| 488 | 488 | ||
| 489 | if (unlikely(!netif_carrier_ok(dev) || | 489 | if (unlikely(!netif_carrier_ok(dev) || |
| 490 | (frags > 1 && !xennet_can_sg(dev)) || | 490 | (frags > 1 && !xennet_can_sg(dev)) || |
| 491 | netif_needs_gso(dev, skb))) { | 491 | netif_needs_gso(skb, netif_skb_features(skb)))) { |
| 492 | spin_unlock_irq(&np->tx_lock); | 492 | spin_unlock_irq(&np->tx_lock); |
| 493 | goto drop; | 493 | goto drop; |
| 494 | } | 494 | } |