diff options
| author | David S. Miller <davem@davemloft.net> | 2014-03-14 22:31:55 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-03-14 22:31:55 -0400 |
| commit | 85dcce7a73f1cc59f7a96fe52713b1630f4ca272 (patch) | |
| tree | 6c645923eb2f0152073b90685ce80e46cfb7afed /drivers/net/xen-netback/interface.c | |
| parent | 4c4e4113db249c828fffb286bc95ffb255e081f5 (diff) | |
| parent | a4ecdf82f8ea49f7d3a072121dcbd0bf3a7cb93a (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/usb/r8152.c
drivers/net/xen-netback/netback.c
Both the r8152 and netback conflicts were simple overlapping
changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/xen-netback/interface.c')
| -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 83a71ac5b93a..a6a8c1579eb9 100644 --- a/drivers/net/xen-netback/interface.c +++ b/drivers/net/xen-netback/interface.c | |||
| @@ -148,8 +148,7 @@ static int xenvif_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
| 148 | /* If the skb is GSO then we'll also need an extra slot for the | 148 | /* If the skb is GSO then we'll also need an extra slot for the |
| 149 | * metadata. | 149 | * metadata. |
| 150 | */ | 150 | */ |
| 151 | if (skb_shinfo(skb)->gso_type & SKB_GSO_TCPV4 || | 151 | if (skb_is_gso(skb)) |
| 152 | skb_shinfo(skb)->gso_type & SKB_GSO_TCPV6) | ||
| 153 | min_slots_needed++; | 152 | min_slots_needed++; |
| 154 | 153 | ||
| 155 | /* If the skb can't possibly fit in the remaining slots | 154 | /* If the skb can't possibly fit in the remaining slots |