s390: network patches for net-next
Subsystems (5)
cover s390: network patches for net-next
Hi Dave,
here are some s390 related patches for net-next
shortlog:
Ursula Braun (1)
netiucv: improve state checking in conn_action_txdone
Eugene Crosser (1)
qeth: Accurate ethtool output
Thanks,
Frank
PATCH 1/2 netiucv: improve state checking in conn_action_txdone
From: Ursula Braun <[email protected]>
state checking in conn_action_txdone() is inconsistent. This patch makes it consistent and issues a trace message if an unexpected state is detected for the netiucv device.
--- drivers/s390/net/netiucv.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/s390/net/netiucv.c +6 -2
@@ -739,8 +739,12 @@ static void conn_action_txdone(fsm_instaIUCV_DBF_TEXT (trace,4 , __func__); -if (conn && conn->netdev) - privptr =netdev_priv (conn->netdev); +if (!conn || !conn->netdev) { +IUCV_DBF_TEXT (data,2 , +"Send confirmation for unlinked connection\n" ); +return ; + } + privptr =netdev_priv (conn->netdev); conn->prof.tx_pending--;if (single_flag) {if ((skb =skb_dequeue (&conn->commit_queue))) {
PATCH 2/2 qeth: Accurate ethtool output
In reply to [email protected]From: Eugene Crosser <[email protected]>
For OSA devices that support the QUERY_CARD_INFO command, supply accurate data based on the card type, port mode and link speed via the 'ethtool' interface.
--- drivers/s390/net/qeth_core.h | 8 + drivers/s390/net/qeth_core_main.c | 198 ++++++++++++++++++++++++++++---------- drivers/s390/net/qeth_core_mpc.h | 28 +++++ 3 files changed, 185 insertions(+), 49 deletions(-)
drivers/s390/net/qeth_core.h +8 -0
@@ -738,6 +738,12 @@ struct qeth_rx {int qdio_err; }; +struct carrier_info { +__u8 card_type; +__u16 port_mode; +__u32 port_speed; +}; +#define QETH_NAPI_WEIGHT NAPI_POLL_WEIGHTstruct qeth_card {
@@ -914,6 +920,8 @@ struct qeth_cmd_buffer *qeth_wait_for_buint qeth_mdio_read (struct net_device *,int ,int );int qeth_snmp_command (struct qeth_card *,char __user *);int qeth_query_oat_command (struct qeth_card *,char __user *); +int qeth_query_card_info (struct qeth_card *card, +struct carrier_info *carrier_info);int qeth_send_control_data (struct qeth_card *,int ,struct qeth_cmd_buffer *,int (*reply_cb)(struct qeth_card *,struct qeth_reply *,unsigned long ),void *reply_param);
drivers/s390/net/qeth_core_main.c +150 -48
247 lines not on this page · raw message
drivers/s390/net/qeth_core_mpc.h +27 -1
@@ -274,7 +274,24 @@ enum qeth_ipa_set_access_mode_rc {SET_ACCESS_CTRL_RC_REFLREL_FAILED =0x0024 , SET_ACCESS_CTRL_RC_REFLREL_DEACT_FAILED = 0x0028, }; - +enum qeth_card_info_card_type { +CARD_INFO_TYPE_1G_COPPER_A =0x61 , +CARD_INFO_TYPE_1G_FIBRE_A =0x71 , +CARD_INFO_TYPE_10G_FIBRE_A =0x91 , +CARD_INFO_TYPE_1G_COPPER_B =0xb1 , +CARD_INFO_TYPE_1G_FIBRE_B =0xa1 , +CARD_INFO_TYPE_10G_FIBRE_B =0xc1 , +}; +enum qeth_card_info_port_mode { +CARD_INFO_PORTM_HALFDUPLEX =0x0002 , +CARD_INFO_PORTM_FULLDUPLEX =0x0003 , +}; +enum qeth_card_info_port_speed { +CARD_INFO_PORTS_10M =0x00000005 , +CARD_INFO_PORTS_100M =0x00000006 , +CARD_INFO_PORTS_1G =0x00000007 , +CARD_INFO_PORTS_10G =0x00000008 , +};/* (SET)DELIP(M) IPA stuff ***************************************************/ struct qeth_ipacmd_setdelip4 {
@@ -404,6 +421,14 @@ struct qeth_qoat_priv {char *buffer; }; +struct qeth_query_card_info { +__u8 card_type; +__u8 reserved1; +__u16 port_mode; +__u32 port_speed; +__u32 reserved2; +}; +struct qeth_ipacmd_setadpparms_hdr {__u32 supp_hw_cmds;__u32 reserved1;
@@ -424,6 +449,7 @@ struct qeth_ipacmd_setadpparms {struct qeth_snmp_cmd snmp;struct qeth_set_access_ctrl set_access_ctrl;struct qeth_query_oat query_oat; +struct qeth_query_card_info card_info;__u32 mode; } data; } __attribute__ ((packed));
David Miller
maintainerFrom: [email protected]
Date: Mon, 16 Dec 2013 09:44:50 +0100
Quoted 1 line
here are some s390 related patches for net-next
Series applied, thanks.