diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-04-25 13:02:35 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-04-25 13:02:35 +0200 |
| commit | 2fc565e4eaf8fc633bfc741b90e1f28dba732ee1 (patch) | |
| tree | 98c994692f84aee07cf1c7b4cda245ae5235a94d /drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c | |
| parent | 7fc7d047216aa4923d401c637be2ebc6e3d5bd9b (diff) | |
| parent | 5cc50fc858a5ab37dc2744d72d7ffed96f23afd8 (diff) | |
| download | blackbird-op-linux-2fc565e4eaf8fc633bfc741b90e1f28dba732ee1.tar.gz blackbird-op-linux-2fc565e4eaf8fc633bfc741b90e1f28dba732ee1.zip | |
Merge tag 'asoc-v3.10-3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: More updates for v3.10
A few more fixes, nothing too major though the DMA changes fix modular
builds.
Diffstat (limited to 'drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c')
| -rw-r--r-- | drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c index 0e630061bff3..5fa847fe388a 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c @@ -358,8 +358,7 @@ set_flags: memcpy(&first_desc->eth_addr, skb->data, ETH_ALEN); } opcode = TX_ETHER_PKT; - if ((adapter->netdev->features & (NETIF_F_TSO | NETIF_F_TSO6)) && - skb_shinfo(skb)->gso_size > 0) { + if (skb_is_gso(skb)) { hdr_len = skb_transport_offset(skb) + tcp_hdrlen(skb); first_desc->mss = cpu_to_le16(skb_shinfo(skb)->gso_size); first_desc->total_hdr_length = hdr_len; |
