diff options
| author |   Ralf Baechle <ralf@linux-mips.org> | 2014-03-31 18:17:33 +0200 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2014-03-31 18:17:33 +0200 |
| commit | ade63aada79c61bcd5f51cbd310f237399892268 (patch) | |
| tree | 4f8605528bfd9b6261679883974b9ac4870223dd /drivers/net/xen-netback/interface.c | |
| parent | MIPS: CPC: Use __raw_ memory access functions (diff) | |
| parent | MIPS: Hibernate: Flush TLB entries in swsusp_arch_resume() (diff) | |
| download | wireguard-linux-ade63aada79c61bcd5f51cbd310f237399892268.tar.xz wireguard-linux-ade63aada79c61bcd5f51cbd310f237399892268.zip | |
Merge branch '3.14-fixes' into mips-for-linux-next
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/xen-netback/interface.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/xen-netback/interface.c b/drivers/net/xen-netback/interface.c index 7669d49a67e2..301cc037fda8 100644 --- a/drivers/net/xen-netback/interface.c +++ b/drivers/net/xen-netback/interface.c @@ -132,8 +132,7 @@ static int xenvif_start_xmit(struct sk_buff *skb, struct net_device *dev) /* If the skb is GSO then we'll also need an extra slot for the * metadata. */ - if (skb_shinfo(skb)->gso_type & SKB_GSO_TCPV4 || - skb_shinfo(skb)->gso_type & SKB_GSO_TCPV6) + if (skb_is_gso(skb)) min_slots_needed++; /* If the skb can't possibly fit in the remaining slots |