Commit f2fbfd95 authored by Martin Schwidefsky's avatar Martin Schwidefsky Committed by Linus Torvalds

[PATCH] s390: qeth network driver.

 - Reset netdevice to defaults in offline processing.
 - Fix checksumming.
 - Fix routing status display.
 - Get rid of _ccw_device_get_device_number in qeth.
 - Inline some functions to save stack space.
parent c862f21a
This diff is collapsed.
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#define QETH_NAME " qeth" #define QETH_NAME " qeth"
#define VERSION_QETH_H "$Revision: 1.47 $" #define VERSION_QETH_H "$Revision: 1.49 $"
/******************** CONFIG STUFF ***********************/ /******************** CONFIG STUFF ***********************/
//#define QETH_DBF_LIKE_HELL //#define QETH_DBF_LIKE_HELL
...@@ -938,6 +938,8 @@ struct qeth_card { /* pointed to by dev->priv */ ...@@ -938,6 +938,8 @@ struct qeth_card { /* pointed to by dev->priv */
__u32 ipa6_enabled; __u32 ipa6_enabled;
__u32 adp_supported; __u32 adp_supported;
__u32 csum_enable_mask;
atomic_t startlan_attempts; atomic_t startlan_attempts;
atomic_t enable_routing_attempts4; atomic_t enable_routing_attempts4;
atomic_t rt4fld; atomic_t rt4fld;
...@@ -1021,7 +1023,7 @@ qeth_get_arphrd_type(int cardtype, int linktype) ...@@ -1021,7 +1023,7 @@ qeth_get_arphrd_type(int cardtype, int linktype)
case QETH_MPC_LINK_TYPE_LANE_TR: case QETH_MPC_LINK_TYPE_LANE_TR:
/* fallthrough */ /* fallthrough */
case QETH_MPC_LINK_TYPE_HSTR: case QETH_MPC_LINK_TYPE_HSTR:
return ARPHRD_IEEE802; return ARPHRD_IEEE802_TR;
default: default:
return ARPHRD_ETHER; return ARPHRD_ETHER;
} }
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#ifndef __QETH_MPC_H__ #ifndef __QETH_MPC_H__
#define __QETH_MPC_H__ #define __QETH_MPC_H__
#define VERSION_QETH_MPC_H "$Revision: 1.15 $" #define VERSION_QETH_MPC_H "$Revision: 1.16 $"
#define QETH_IPA_TIMEOUT (card->ipa_timeout) #define QETH_IPA_TIMEOUT (card->ipa_timeout)
#define QETH_MPC_TIMEOUT 2000 #define QETH_MPC_TIMEOUT 2000
...@@ -188,7 +188,7 @@ extern unsigned char DM_ACT[]; ...@@ -188,7 +188,7 @@ extern unsigned char DM_ACT[];
#define IPA_CMD_ASS_ARP_QUERY_INFO 0x0104 #define IPA_CMD_ASS_ARP_QUERY_INFO 0x0104
#define IPA_CMD_ASS_ARP_QUERY_STATS 0x0204 #define IPA_CMD_ASS_ARP_QUERY_STATS 0x0204
#define IPA_CHECKSUM_ENABLE_MASK 0x001a #define IPA_CHECKSUM_DEFAULT_ENABLE_MASK 0x001a
#define IPA_CMD_ASS_FILTER_SET_TYPES 0x0003 #define IPA_CMD_ASS_FILTER_SET_TYPES 0x0003
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment