diff options
| author | Julian Wiedmann | 2017-12-20 20:11:03 +0100 |
|---|---|---|
| committer | David S. Miller | 2017-12-20 21:23:45 +0100 |
| commit | 19e36da61a90fe95116634f66196cc9b2e61b368 (patch) | |
| tree | 0542cbc2f2ded9a66903630fe66662e412534eef /drivers/s390/net/qeth_core.h | |
| parent | s390/qeth: align L2 and L3 set_rx_mode() implementations (diff) | |
| download | kernel-qcow2-linux-19e36da61a90fe95116634f66196cc9b2e61b368.tar.gz kernel-qcow2-linux-19e36da61a90fe95116634f66196cc9b2e61b368.tar.xz kernel-qcow2-linux-19e36da61a90fe95116634f66196cc9b2e61b368.zip | |
s390/qeth: robustify qeth_get_ip_version()
Instead of assuming that skb->data points to the Ethernet header, use
the right helper and struct to access the Ethertype field.
Signed-off-by: Julian Wiedmann <jwi@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/s390/net/qeth_core.h')
| -rw-r--r-- | drivers/s390/net/qeth_core.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/s390/net/qeth_core.h b/drivers/s390/net/qeth_core.h index f5ee62c98011..af9d1efd2e78 100644 --- a/drivers/s390/net/qeth_core.h +++ b/drivers/s390/net/qeth_core.h @@ -847,14 +847,16 @@ static inline int qeth_get_micros(void) static inline int qeth_get_ip_version(struct sk_buff *skb) { - __be16 *p = &((struct ethhdr *)skb->data)->h_proto; + struct vlan_ethhdr *veth = vlan_eth_hdr(skb); + __be16 prot = veth->h_vlan_proto; - if (be16_to_cpu(*p) == ETH_P_8021Q) - p += 2; - switch (be16_to_cpu(*p)) { - case ETH_P_IPV6: + if (prot == htons(ETH_P_8021Q)) + prot = veth->h_vlan_encapsulated_proto; + + switch (prot) { + case htons(ETH_P_IPV6): return 6; - case ETH_P_IP: + case htons(ETH_P_IP): return 4; default: return 0; |