diff options
| author |   Julian Wiedmann <jwi@linux.vnet.ibm.com> | 2017-12-20 20:11:06 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-12-20 15:23:45 -0500 |
| commit | a843383a3e046af550cff5d33149541fcb0ea4e0 (patch) | |
| tree | 21e4f07aa9f906d3a04dc92382fce9492c8dbfe8 /drivers/s390/net/qeth_core.h | |
| parent | s390/qeth: recognize non-IP multicast on L3 transmit (diff) | |
| download | linux-dev-a843383a3e046af550cff5d33149541fcb0ea4e0.tar.xz linux-dev-a843383a3e046af550cff5d33149541fcb0ea4e0.zip | |
s390/qeth: unionize next-hop field in qeth L3 header
The L3 packet descriptor's 'dest_addr' field is used for a different
purpose in RX descriptors. Clean up the hard-coded byte accesses and
try to be more self-documenting.
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 | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/drivers/s390/net/qeth_core.h b/drivers/s390/net/qeth_core.h index 100f7cce0260..db42107bf2f5 100644 --- a/drivers/s390/net/qeth_core.h +++ b/drivers/s390/net/qeth_core.h @@ -297,8 +297,23 @@ struct qeth_hdr_layer3 { __u8 ext_flags; __u16 vlan_id; __u16 frame_offset; - __u8 dest_addr[16]; -} __attribute__ ((packed)); + union { + /* TX: */ + u8 ipv6_addr[16]; + struct ipv4 { + u8 res[12]; + u32 addr; + } ipv4; + /* RX: */ + struct rx { + u8 res1[2]; + u8 src_mac[6]; + u8 res2[4]; + u16 vlan_id; + u8 res3[2]; + } rx; + } next_hop; +}; struct qeth_hdr_layer2 { __u8 id; |