s390 (8/12): qeth layer 2 support.
Subsystems (3)
PATCH 1/1 s390 (8/12): qeth layer 2 support.
[PATCH] s390: qeth layer 2 support.
From: Frank Pavlic <[email protected]>
From: Thomas Spatzier <[email protected]>
qeth network driver changes:
- Add Layer 2 support for OSA-Express.
Signed-off-by Martin Schwidefsky <[email protected]>
diffstat:
drivers/s390/net/qeth.h | 51 ++- drivers/s390/net/qeth_main.c | 634 +++++++++++++++++++++++++++++++++++++------ drivers/s390/net/qeth_mpc.h | 39 ++ drivers/s390/net/qeth_sys.c | 93 ++++++ 4 files changed, 713 insertions(+), 104 deletions(-)
drivers/s390/net/qeth.h +44 -7
@@ -23,7 +23,7 @@#include "qeth_mpc.h" -#define VERSION_QETH_H "$Revision: 1.113 $" +#define VERSION_QETH_H "$Revision: 1.116 $"#ifdef CONFIG_QETH_IPV6 #define QETH_VERSION_IPV6 ":IPv6"
@@ -43,7 +43,7 @@#define QETH_DBF_SETUP_LEN 8#define QETH_DBF_SETUP_INDEX 3#define QETH_DBF_SETUP_NR_AREAS 1 -#define QETH_DBF_SETUP_LEVEL 3 +#define QETH_DBF_SETUP_LEVEL 5#define QETH_DBF_MISC_NAME "qeth_misc"#define QETH_DBF_MISC_LEN 128
@@ -61,13 +61,13 @@#define QETH_DBF_CONTROL_LEN 256#define QETH_DBF_CONTROL_INDEX 3#define QETH_DBF_CONTROL_NR_AREAS 2 -#define QETH_DBF_CONTROL_LEVEL 2 +#define QETH_DBF_CONTROL_LEVEL 5#define QETH_DBF_TRACE_NAME "qeth_trace"#define QETH_DBF_TRACE_LEN 8#define QETH_DBF_TRACE_INDEX 2#define QETH_DBF_TRACE_NR_AREAS 2 -#define QETH_DBF_TRACE_LEVEL 3 +#define QETH_DBF_TRACE_LEVEL 5#define QETH_DBF_SENSE_NAME "qeth_sense"#define QETH_DBF_SENSE_LEN 64
@@ -334,7 +334,7 @@#define QETH_EXT_HDR_TOKEN_ID 0x02#define QETH_EXT_HDR_INCLUDE_VLAN_TAG 0x04 -struct qeth_hdr { +struct qeth_hdr_layer3 {__u8 id;__u8 flags;__u16 inbound_checksum;
@@ -347,6 +347,26 @@__u8 dest_addr[16 ]; } __attribute__ ((packed)); +struct qeth_hdr_layer2 { +__u8 id; +__u8 flags[3 ]; +__u8 port_no; +__u8 hdr_length; +__u16 pkt_length; +__u16 seq_no; +__u16 vlan_id; +__u32 reserved; +__u8 reserved2[16 ]; +} __attribute__ ((packed)); + +struct qeth_hdr { +union { +struct qeth_hdr_layer2 l2; +struct qeth_hdr_layer3 l3; + } hdr; +} __attribute__ ((packed)); + +/* flags for qeth_hdr.flags */ #define QETH_HDR_PASSTHRU 0x10#define QETH_HDR_IPV6 0x80
@@ -359,6 +379,17 @@ QETH_CAST_NOCAST = 0x00, }; +enum qeth_layer2_frame_flags { +QETH_LAYER2_FLAG_MULTICAST =0x01 , +QETH_LAYER2_FLAG_BROADCAST =0x02 , +QETH_LAYER2_FLAG_UNICAST =0x04 , +QETH_LAYER2_FLAG_VLAN =0x10 , +}; + +enum qeth_header_ids { +QETH_HEADER_TYPE_LAYER3 =0x01 , +QETH_HEADER_TYPE_LAYER2 =0x02 , +};/* flags for qeth_hdr.ext_flags */ #define QETH_HDR_EXT_VLAN_FRAME 0x01#define QETH_HDR_EXT_CSUM_HDR_REQ 0x10
@@ -645,6 +676,7 @@__u16 func_level;char mcl_level[QETH_MCL_LENGTH +1 ];int guestlan; +int layer2_mac_registered;int portname_required;int portno;char portname[9 ];
@@ -672,6 +704,7 @@int fake_broadcast;int add_hhlen;int fake_ll; +int layer2; };/*
@@ -706,6 +739,8 @@#ifdef CONFIG_QETH_VLAN spinlock_t vlanlock;struct vlan_group *vlangrp; +__u8 vlans_current[VLAN_GROUP_ARRAY_LEN /(8 *sizeof (__u8))]; +__u8 vlans_new[VLAN_GROUP_ARRAY_LEN /(8 *sizeof (__u8))];#endif struct work_struct kernel_thread_starter;spinlock_t thread_mask_lock;
@@ -779,9 +814,11 @@ }inline static unsigned short -qeth_get_netdev_flags (int cardtype) +qeth_get_netdev_flags (struct qeth_card *card) { -switch (cardtype) { +if (card->options.layer2) +return 0 ; +switch (card->info.type) {case QETH_CARD_TYPE_IQD :return IFF_NOARP ;#ifdef CONFIG_QETH_IPV6
drivers/s390/net/qeth_main.c +547 -87
1,027 lines not on this page · raw message
drivers/s390/net/qeth_mpc.h +31 -8
@@ -14,7 +14,7 @@#include <asm/qeth.h> -#define VERSION_QETH_MPC_H "$Revision: 1.36 $" +#define VERSION_QETH_MPC_H "$Revision: 1.38 $"extern const char *VERSION_QETH_MPC_C ;
@@ -105,6 +105,12 @@enum qeth_ipa_cmds {IPA_CMD_STARTLAN =0x01 ,IPA_CMD_STOPLAN =0x02 , +IPA_CMD_SETVMAC =0x21 , +IPA_CMD_DELVMAC =0x22 , +IPA_CMD_SETGMAC =0x23 , +IPA_CMD_DELGMAC =0x24 , +IPA_CMD_SETVLAN =0x25 , +IPA_CMD_DELVLAN =0x26 ,IPA_CMD_SETIP =0xb1 ,IPA_CMD_DELIP =0xb7 ,IPA_CMD_QIPASSIST =0xb2 ,
@@ -239,6 +245,16 @@__u8 ip4[4 ]; } __attribute__ ((packed)); +struct qeth_ipacmd_layer2setdelmac { +__u32 mac_length; +__u8 mac[6 ]; +} __attribute__ ((packed)); + +struct qeth_ipacmd_layer2setdelvlan { +__u16 vlan_id; +} __attribute__ ((packed)); + +struct qeth_ipacmd_setassparms_hdr {__u32 assist_no;__u16 length;
@@ -381,13 +397,15 @@struct qeth_ipa_cmd {struct qeth_ipacmd_hdr hdr;union { -struct qeth_ipacmd_setdelip4 setdelip4; -struct qeth_ipacmd_setdelip6 setdelip6; -struct qeth_ipacmd_setdelipm setdelipm; -struct qeth_ipacmd_setassparms setassparms; -struct qeth_create_destroy_address create_destroy_addr; -struct qeth_ipacmd_setadpparms setadapterparms; -struct qeth_set_routing setrtg; +struct qeth_ipacmd_setdelip4 setdelip4; +struct qeth_ipacmd_setdelip6 setdelip6; +struct qeth_ipacmd_setdelipm setdelipm; +struct qeth_ipacmd_setassparms setassparms; +struct qeth_ipacmd_layer2setdelmac setdelmac; +struct qeth_ipacmd_layer2setdelvlan setdelvlan; +struct qeth_create_destroy_address create_destroy_addr; +struct qeth_ipacmd_setadpparms setadapterparms; +struct qeth_set_routing setrtg; } data; } __attribute__ ((packed));
@@ -459,6 +477,11 @@ (PDU_ENCAPSULATION(buffer) + 0x17)#define QETH_ULP_ENABLE_RESP_LINK_TYPE (buffer) \ (PDU_ENCAPSULATION(buffer)+ 0x2b) +/* Layer 2 defintions */ +#define QETH_PROT_LAYER2 0x08 +#define QETH_PROT_TCPIP 0x03 +#define QETH_ULP_ENABLE_PROT_TYPE (buffer) (buffer+0x50) +#define QETH_IPA_CMD_PROT_TYPE (buffer) (buffer+0x19)extern unsigned char ULP_SETUP [];#define ULP_SETUP_SIZE 0x6c
drivers/s390/net/qeth_sys.c +91 -2
218 lines not on this page · raw message