s390: network bug fixes for net
Subsystems (4)
cover s390: network bug fixes for net
Hi Dave,
here are 3 bug fixes for net.
shortlog:
Stefan Raspl (2)
qeth: delay feature trace
qeth: Fix invalid router settings handling
Frank Blaschka (1)
qeth: Fix scatter-gather regression
Thanks,
Frank
PATCH 1/3 qeth: delay feature trace
From: Stefan Raspl <[email protected]>
Delay tracing of the card features until the optional commands have been enabled.
--- drivers/s390/net/qeth_l3_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/s390/net/qeth_l3_main.c +1 -1
@@ -3348,7 +3348,6 @@ static int __qeth_l3_set_online(struct c rc = -ENODEV ; goto out_remove; } -qeth_trace_features (card);if (!card->dev &&qeth_l3_setup_netdev (card)) { rc = -ENODEV ;
@@ -3425,6 +3424,7 @@ contin:qeth_l3_set_multicast_list (card->dev);rtnl_unlock (); } +qeth_trace_features (card);/* let user_space know that device is online */ kobject_uevent (&gdev->dev.kobj,KOBJ_CHANGE );mutex_unlock (&card->conf_mutex);
PATCH 2/3 qeth: Fix invalid router settings handling
In reply to [email protected]From: Stefan Raspl <[email protected]>
Give a bad return code when specifying a router setting that is either invalid or not support on the respective device type. In addition, fall back the previous setting instead of silently switching back to 'no routing'.
--- drivers/s390/net/qeth_l3_main.c | 17 +++++++++++------ drivers/s390/net/qeth_l3_sys.c | 2 ++ 2 files changed, 13 insertions(+), 6 deletions(-)
drivers/s390/net/qeth_l3_main.c +11 -6
@@ -623,7 +623,7 @@ static int qeth_l3_send_setrouting(strucreturn rc; } -static void qeth_l3_correct_routing_type (struct qeth_card *card, +static int qeth_l3_correct_routing_type (struct qeth_card *card,enum qeth_routing_types *type,enum qeth_prot_versions prot) {if (card->info.type ==QETH_CARD_TYPE_IQD ) {
@@ -632,7 +632,7 @@ static void qeth_l3_correct_routing_typecase PRIMARY_CONNECTOR :case SECONDARY_CONNECTOR :case MULTICAST_ROUTER : -return ; +return 0 ;default : goto out_inval; }
@@ -641,17 +641,18 @@ static void qeth_l3_correct_routing_typecase NO_ROUTER :case PRIMARY_ROUTER :case SECONDARY_ROUTER : -return ; +return 0 ;case MULTICAST_ROUTER :if (qeth_is_ipafunc_supported (card, prot,IPA_OSA_MC_ROUTER )) -return ; +return 0 ;default : goto out_inval; } } out_inval: *type =NO_ROUTER ; +return -EINVAL ; }int qeth_l3_setrouting_v4 (struct qeth_card *card)
@@ -660,8 +661,10 @@ int qeth_l3_setrouting_v4(struct qeth_caQETH_CARD_TEXT (card,3 ,"setrtg4" ); -qeth_l3_correct_routing_type (card, &card->options.route4.type, + rc =qeth_l3_correct_routing_type (card, &card->options.route4.type,QETH_PROT_IPV4 ); +if (rc) +return rc; rc =qeth_l3_send_setrouting (card, card->options.route4.type,QETH_PROT_IPV4 );
@@ -683,8 +686,10 @@ int qeth_l3_setrouting_v6(struct qeth_caif (!qeth_is_supported (card,IPA_IPV6 ))return 0 ; -qeth_l3_correct_routing_type (card, &card->options.route6.type, + rc =qeth_l3_correct_routing_type (card, &card->options.route6.type,QETH_PROT_IPV6 ); +if (rc) +return rc; rc =qeth_l3_send_setrouting (card, card->options.route6.type,QETH_PROT_IPV6 );
drivers/s390/net/qeth_l3_sys.c +2 -0
@@ -87,6 +87,8 @@ static ssize_t qeth_l3_dev_route_store(s rc =qeth_l3_setrouting_v6 (card); } out: +if (rc) + route->type = old_route_type;mutex_unlock (&card->conf_mutex);return rc ? rc : count; }
PATCH 3/3 qeth: Fix scatter-gather regression
In reply to [email protected]From: Frank Blaschka <[email protected]>
This patch fixes a scatter-gather regression introduced with
commit 5640f768 net: use a per task frag allocator
Now the qeth driver can cope with bigger framents and split a fragment in sub framents if required.
--- drivers/s390/net/qeth_core.h | 1 drivers/s390/net/qeth_core_main.c | 45 ++++++++++++++++++++++++++++++++------ drivers/s390/net/qeth_l3_main.c | 4 ++- 3 files changed, 42 insertions(+), 8 deletions(-)
drivers/s390/net/qeth_core.h +1 -0
@@ -916,6 +916,7 @@ int qeth_send_control_data(struct qeth_c void *reply_param);int qeth_get_priority_queue (struct qeth_card *,struct sk_buff *,int ,int );int qeth_get_elements_no (struct qeth_card *,void *,struct sk_buff *,int ); +int qeth_get_elements_for_frags (struct sk_buff *);int qeth_do_send_packet_fast (struct qeth_card *,struct qeth_qdio_out_q *,struct sk_buff *,struct qeth_hdr *,int ,int ,int ); int qeth_do_send_packet(struct qeth_card *, struct qeth_qdio_out_q *,
drivers/s390/net/qeth_core_main.c +38 -7
63 lines not on this page · raw message
drivers/s390/net/qeth_l3_main.c +3 -1
@@ -2903,7 +2903,9 @@ static inline int qeth_l3_tso_elements(stcp_hdr (skb)->doff *4 ;int tcpd_len = skb->len - (tcpd - (unsigned long )skb->data);int elements =PFN_UP (tcpd + tcpd_len -1 ) -PFN_DOWN (tcpd); - elements +=skb_shinfo (skb)->nr_frags; + + elements +=qeth_get_elements_for_frags (skb); +return elements; }
David Miller
maintainerFrom: [email protected]
Date: Tue, 19 Mar 2013 07:04:41 +0100
Quoted 1 line
here are 3 bug fixes for net.
All applied, thanks Frank.