git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...
[pandora-kernel.git]
/
drivers
/
net
/
xen-netfront.c
diff --git
a/drivers/net/xen-netfront.c
b/drivers/net/xen-netfront.c
index
cdbeec9
..
546de57
100644
(file)
--- 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)
if (unlikely(!netif_carrier_ok(dev) ||
(frags > 1 && !xennet_can_sg(dev)) ||
- netif_needs_gso(
dev, skb
))) {
+ netif_needs_gso(
skb, netif_skb_features(skb)
))) {
spin_unlock_irq(&np->tx_lock);
goto drop;
}