diff options
Diffstat (limited to 'drivers/s390/net/qeth.h')
-rw-r--r-- | drivers/s390/net/qeth.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/s390/net/qeth.h b/drivers/s390/net/qeth.h index 635044a4a40b..44b9e14222a9 100644 --- a/drivers/s390/net/qeth.h +++ b/drivers/s390/net/qeth.h | |||
@@ -25,7 +25,7 @@ | |||
25 | 25 | ||
26 | #include "qeth_mpc.h" | 26 | #include "qeth_mpc.h" |
27 | 27 | ||
28 | #define VERSION_QETH_H "$Revision: 1.151 $" | 28 | #define VERSION_QETH_H "$Revision: 1.152 $" |
29 | 29 | ||
30 | #ifdef CONFIG_QETH_IPV6 | 30 | #ifdef CONFIG_QETH_IPV6 |
31 | #define QETH_VERSION_IPV6 ":IPv6" | 31 | #define QETH_VERSION_IPV6 ":IPv6" |
@@ -719,8 +719,6 @@ struct qeth_reply { | |||
719 | atomic_t refcnt; | 719 | atomic_t refcnt; |
720 | }; | 720 | }; |
721 | 721 | ||
722 | #define QETH_BROADCAST_WITH_ECHO 1 | ||
723 | #define QETH_BROADCAST_WITHOUT_ECHO 2 | ||
724 | 722 | ||
725 | struct qeth_card_blkt { | 723 | struct qeth_card_blkt { |
726 | int time_total; | 724 | int time_total; |
@@ -728,8 +726,10 @@ struct qeth_card_blkt { | |||
728 | int inter_packet_jumbo; | 726 | int inter_packet_jumbo; |
729 | }; | 727 | }; |
730 | 728 | ||
731 | 729 | #define QETH_BROADCAST_WITH_ECHO 0x01 | |
732 | 730 | #define QETH_BROADCAST_WITHOUT_ECHO 0x02 | |
731 | #define QETH_LAYER2_MAC_READ 0x01 | ||
732 | #define QETH_LAYER2_MAC_REGISTERED 0x02 | ||
733 | struct qeth_card_info { | 733 | struct qeth_card_info { |
734 | unsigned short unit_addr2; | 734 | unsigned short unit_addr2; |
735 | unsigned short cula; | 735 | unsigned short cula; |
@@ -737,7 +737,7 @@ struct qeth_card_info { | |||
737 | __u16 func_level; | 737 | __u16 func_level; |
738 | char mcl_level[QETH_MCL_LENGTH + 1]; | 738 | char mcl_level[QETH_MCL_LENGTH + 1]; |
739 | int guestlan; | 739 | int guestlan; |
740 | int layer2_mac_registered; | 740 | int mac_bits; |
741 | int portname_required; | 741 | int portname_required; |
742 | int portno; | 742 | int portno; |
743 | char portname[9]; | 743 | char portname[9]; |