]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
s390/qeth: pass correct length to header_ops->create()
authorJulian Wiedmann <jwi@linux.vnet.ibm.com>
Fri, 9 Mar 2018 17:12:56 +0000 (18:12 +0100)
committerDavid S. Miller <davem@davemloft.net>
Fri, 9 Mar 2018 18:10:04 +0000 (13:10 -0500)
We need to pass the *payload* length, not the L2 address length.
For qeth (using eth_header()) this is merely a cosmetic change:
the parameter only matters when building headers for ETH_P_802_2
or ETH_P_802_3, whereas our fake headers are built with
ETH_P_IP / ETH_P_IPV6 / 0.

Signed-off-by: Julian Wiedmann <jwi@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/s390/net/qeth_l3_main.c

index e933a273d543d0e7017e860e9a10570a7416e5b0..8e8818ea33e2a61798b93634804819cea2fb93c0 100644 (file)
@@ -1522,10 +1522,10 @@ static void qeth_l3_rebuild_skb(struct qeth_card *card, struct sk_buff *skb,
                if (hdr->hdr.l3.ext_flags & QETH_HDR_EXT_SRC_MAC_ADDR)
                        card->dev->header_ops->create(skb, card->dev, prot,
                                tg_addr, &hdr->hdr.l3.next_hop.rx.src_mac,
-                               card->dev->addr_len);
+                               skb->len);
                else
                        card->dev->header_ops->create(skb, card->dev, prot,
-                               tg_addr, "FAKELL", card->dev->addr_len);
+                               tg_addr, "FAKELL", skb->len);
        }
 
        skb->protocol = eth_type_trans(skb, card->dev);
@@ -1584,8 +1584,7 @@ static int qeth_l3_process_inbound_buffer(struct qeth_card *card,
                                skb->dev = card->dev;
                                len = skb->len;
                                card->dev->header_ops->create(skb, card->dev, 0,
-                                       card->dev->dev_addr, "FAKELL",
-                                       card->dev->addr_len);
+                                       card->dev->dev_addr, "FAKELL", len);
                                netif_receive_skb(skb);
                        } else {
                                qeth_l3_rebuild_skb(card, skb, hdr);