Skip to content

Commit f9c4845

Browse files
julianwiedmannkuba-moo
authored andcommitted
s390/qeth: fix L2 header access in qeth_l3_osa_features_check()
ip_finish_output_gso() may call .ndo_features_check() even before the skb has a L2 header. This conflicts with qeth_get_ip_version()'s attempt to inspect the L2 header via vlan_eth_hdr(). Switch to vlan_get_protocol(), as already used further down in the common qeth_features_check() path. Fixes: f13ade1 ("s390/qeth: run non-offload L3 traffic over common xmit path") Signed-off-by: Julian Wiedmann <jwi@linux.ibm.com> Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent b41b554 commit f9c4845

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/s390/net/qeth_l3_main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1813,7 +1813,7 @@ static netdev_features_t qeth_l3_osa_features_check(struct sk_buff *skb,
18131813
struct net_device *dev,
18141814
netdev_features_t features)
18151815
{
1816-
if (qeth_get_ip_version(skb) != 4)
1816+
if (vlan_get_protocol(skb) != htons(ETH_P_IP))
18171817
features &= ~NETIF_F_HW_VLAN_CTAG_TX;
18181818
return qeth_features_check(skb, dev, features);
18191819
}

0 commit comments

Comments
 (0)