diff options
| author | Julian Wiedmann <jwi@linux.vnet.ibm.com> | 2017-06-06 14:33:43 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-06-06 13:04:59 -0400 |
| commit | 94a9c981f7bdfdb6d092d1f92546bf61552c95d7 (patch) | |
| tree | ce8dad263cd594d68386f3df6a6a0a55c72317fd /drivers/s390/net | |
| parent | 4845b93ff2c9247f5fed88182ea71dba370e76bb (diff) | |
| download | op-kernel-dev-94a9c981f7bdfdb6d092d1f92546bf61552c95d7.zip op-kernel-dev-94a9c981f7bdfdb6d092d1f92546bf61552c95d7.tar.gz | |
s390/qeth: remove skb_is_nonlinear() check on IQD
qeth doesn't advertise NETIF_F_SG for L3 IQDs. So trust the stack to
not hand us any nonlinear skbs, and remove an always-true condition.
With the fact that data_offset < 0 is no longer possible on IQDs,
apply a small cleanup to subsequent code.
Signed-off-by: Julian Wiedmann <jwi@linux.vnet.ibm.com>
Acked-by: Ursula Braun <ubraun@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/s390/net')
| -rw-r--r-- | drivers/s390/net/qeth_l3_main.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c index ac8310f..56e8139 100644 --- a/drivers/s390/net/qeth_l3_main.c +++ b/drivers/s390/net/qeth_l3_main.c @@ -2676,8 +2676,7 @@ static netdev_tx_t qeth_l3_hard_start_xmit(struct sk_buff *skb, use_tso = skb_is_gso(skb) && (qeth_get_ip_protocol(skb) == IPPROTO_TCP) && (ipv == 4); - if ((card->info.type == QETH_CARD_TYPE_IQD) && - !skb_is_nonlinear(skb)) { + if (card->info.type == QETH_CARD_TYPE_IQD) { new_skb = skb; data_offset = ETH_HLEN; hdr = kmem_cache_alloc(qeth_core_header_cache, GFP_ATOMIC); @@ -2690,12 +2689,7 @@ static netdev_tx_t qeth_l3_hard_start_xmit(struct sk_buff *skb, + VLAN_HLEN); if (!new_skb) goto tx_drop; - } - if (card->info.type == QETH_CARD_TYPE_IQD) { - if (data_offset < 0) - skb_pull(new_skb, ETH_HLEN); - } else { if (ipv == 4) { skb_pull(new_skb, ETH_HLEN); } |
