* [patch 1/4] af_iucv: recvmsg problem for SOCK_STREAM sockets
2014-03-19 6:57 [patch 0/4] s390: network patches for net-next frank.blaschka
@ 2014-03-19 6:57 ` frank.blaschka
2014-03-19 6:58 ` [patch 2/4] qeth: make qeth_query_card_info_cb() static frank.blaschka
` (3 subsequent siblings)
4 siblings, 0 replies; 9+ messages in thread
From: frank.blaschka @ 2014-03-19 6:57 UTC (permalink / raw)
To: davem; +Cc: netdev, linux-s390, Ursula Braun, Hendrik Brueckner
[-- Attachment #1: 600-af-iucv-recvmsg.diff --]
[-- Type: text/plain, Size: 1019 bytes --]
From: Ursula Braun <ursula.braun@de.ibm.com>
Commit f9c41a62bba3f3f7ef3541b2a025e3371bcbba97 introduced
a problem for SOCK_STREAM sockets, when only part of the
incoming iucv message is received by user space. In this
case the remaining data of the iucv message is lost.
This patch makes sure an incompletely received iucv message
is queued back to the receive queue.
Signed-off-by: Ursula Braun <ursula.braun@de.ibm.com>
Signed-off-by: Frank Blaschka <frank.blaschka@de.ibm.com>
Reported-by: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
---
net/iucv/af_iucv.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
index c4b7218..a5e0311 100644
--- a/net/iucv/af_iucv.c
+++ b/net/iucv/af_iucv.c
@@ -1382,6 +1382,7 @@ static int iucv_sock_recvmsg(struct kiocb *iocb, struct socket *sock,
if (sk->sk_type == SOCK_STREAM) {
if (copied < rlen) {
IUCV_SKB_CB(skb)->offset = offset + copied;
+ skb_queue_head(&sk->sk_receive_queue, skb);
goto done;
}
}
^ permalink raw reply related [flat|nested] 9+ messages in thread* [patch 2/4] qeth: make qeth_query_card_info_cb() static
2014-03-19 6:57 [patch 0/4] s390: network patches for net-next frank.blaschka
2014-03-19 6:57 ` [patch 1/4] af_iucv: recvmsg problem for SOCK_STREAM sockets frank.blaschka
@ 2014-03-19 6:58 ` frank.blaschka
2014-03-19 6:58 ` [patch 3/4] qeth: Removed unused parameter frank.blaschka
` (2 subsequent siblings)
4 siblings, 0 replies; 9+ messages in thread
From: frank.blaschka @ 2014-03-19 6:58 UTC (permalink / raw)
To: davem; +Cc: netdev, linux-s390, Heiko Carstens
[-- Attachment #1: 601-qeth-static-fns.diff --]
[-- Type: text/plain, Size: 823 bytes --]
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Frank Blaschka <frank.blaschka@de.ibm.com>
---
drivers/s390/net/qeth_core_main.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c
index a0aff2e..22470a3 100644
--- a/drivers/s390/net/qeth_core_main.c
+++ b/drivers/s390/net/qeth_core_main.c
@@ -4610,8 +4610,8 @@ out:
}
EXPORT_SYMBOL_GPL(qeth_query_oat_command);
-int qeth_query_card_info_cb(struct qeth_card *card,
- struct qeth_reply *reply, unsigned long data)
+static int qeth_query_card_info_cb(struct qeth_card *card,
+ struct qeth_reply *reply, unsigned long data)
{
struct qeth_ipa_cmd *cmd;
struct qeth_query_card_info *card_info;
^ permalink raw reply related [flat|nested] 9+ messages in thread* [patch 3/4] qeth: Removed unused parameter
2014-03-19 6:57 [patch 0/4] s390: network patches for net-next frank.blaschka
2014-03-19 6:57 ` [patch 1/4] af_iucv: recvmsg problem for SOCK_STREAM sockets frank.blaschka
2014-03-19 6:58 ` [patch 2/4] qeth: make qeth_query_card_info_cb() static frank.blaschka
@ 2014-03-19 6:58 ` frank.blaschka
2014-03-19 6:58 ` [patch 4/4] qeth: Fix IP version detection for VLAN traffic frank.blaschka
2014-03-20 4:07 ` [patch 0/4] s390: network patches for net-next David Miller
4 siblings, 0 replies; 9+ messages in thread
From: frank.blaschka @ 2014-03-19 6:58 UTC (permalink / raw)
To: davem; +Cc: netdev, linux-s390, Stefan Raspl
[-- Attachment #1: 602-qeth-unused-param.diff --]
[-- Type: text/plain, Size: 1573 bytes --]
From: Stefan Raspl <raspl@linux.vnet.ibm.com>
Signed-off-by: Stefan Raspl <raspl@linux.vnet.ibm.com>
Signed-off-by: Frank Blaschka <frank.blaschka@de.ibm.com>
---
drivers/s390/net/qeth_l2_main.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c
index 908d825..8dea3f1 100644
--- a/drivers/s390/net/qeth_l2_main.c
+++ b/drivers/s390/net/qeth_l2_main.c
@@ -241,7 +241,7 @@ static inline int qeth_l2_get_cast_type(struct qeth_card *card,
}
static void qeth_l2_fill_header(struct qeth_card *card, struct qeth_hdr *hdr,
- struct sk_buff *skb, int ipv, int cast_type)
+ struct sk_buff *skb, int cast_type)
{
struct vlan_ethhdr *veth = (struct vlan_ethhdr *)skb_mac_header(skb);
@@ -762,7 +762,7 @@ static int qeth_l2_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
goto tx_drop;
elements_needed++;
skb_reset_mac_header(new_skb);
- qeth_l2_fill_header(card, hdr, new_skb, ipv, cast_type);
+ qeth_l2_fill_header(card, hdr, new_skb, cast_type);
hdr->hdr.l2.pkt_length = new_skb->len;
memcpy(((char *)hdr) + sizeof(struct qeth_hdr),
skb_mac_header(new_skb), ETH_HLEN);
@@ -775,7 +775,7 @@ static int qeth_l2_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
hdr = (struct qeth_hdr *)skb_push(new_skb,
sizeof(struct qeth_hdr));
skb_set_mac_header(new_skb, sizeof(struct qeth_hdr));
- qeth_l2_fill_header(card, hdr, new_skb, ipv, cast_type);
+ qeth_l2_fill_header(card, hdr, new_skb, cast_type);
}
}
^ permalink raw reply related [flat|nested] 9+ messages in thread* [patch 4/4] qeth: Fix IP version detection for VLAN traffic
2014-03-19 6:57 [patch 0/4] s390: network patches for net-next frank.blaschka
` (2 preceding siblings ...)
2014-03-19 6:58 ` [patch 3/4] qeth: Removed unused parameter frank.blaschka
@ 2014-03-19 6:58 ` frank.blaschka
2014-03-20 4:07 ` [patch 0/4] s390: network patches for net-next David Miller
4 siblings, 0 replies; 9+ messages in thread
From: frank.blaschka @ 2014-03-19 6:58 UTC (permalink / raw)
To: davem; +Cc: netdev, linux-s390, Stefan Raspl
[-- Attachment #1: 603-qeth-ip-version-vlan.diff --]
[-- Type: text/plain, Size: 1045 bytes --]
From: Stefan Raspl <raspl@linux.vnet.ibm.com>
The current code would always return 0 for VLAN-encapsulated IP traffic.
One notable side effect was that VLAN traffic would never get prioritized
on OSD and OSX devices when priority queueing modes prio_queueing_tos or
prio_queueing_prec were enabled.
Signed-off-by: Stefan Raspl <raspl@linux.vnet.ibm.com>
Signed-off-by: Frank Blaschka <frank.blaschka@de.ibm.com>
---
drivers/s390/net/qeth_core.h | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/s390/net/qeth_core.h b/drivers/s390/net/qeth_core.h
index a0de045..5333b2c 100644
--- a/drivers/s390/net/qeth_core.h
+++ b/drivers/s390/net/qeth_core.h
@@ -854,8 +854,11 @@ static inline int qeth_get_micros(void)
static inline int qeth_get_ip_version(struct sk_buff *skb)
{
- struct ethhdr *ehdr = (struct ethhdr *)skb->data;
- switch (ehdr->h_proto) {
+ __be16 *p = &((struct ethhdr *)skb->data)->h_proto;
+
+ if (*p == ETH_P_8021Q)
+ p += 2;
+ switch (*p) {
case ETH_P_IPV6:
return 6;
case ETH_P_IP:
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [patch 0/4] s390: network patches for net-next
2014-03-19 6:57 [patch 0/4] s390: network patches for net-next frank.blaschka
` (3 preceding siblings ...)
2014-03-19 6:58 ` [patch 4/4] qeth: Fix IP version detection for VLAN traffic frank.blaschka
@ 2014-03-20 4:07 ` David Miller
4 siblings, 0 replies; 9+ messages in thread
From: David Miller @ 2014-03-20 4:07 UTC (permalink / raw)
To: frank.blaschka; +Cc: netdev, linux-s390
From: frank.blaschka@de.ibm.com
Date: Wed, 19 Mar 2014 07:57:58 +0100
> here are some s390 related patches for net-next
Series applied, thank you.
^ permalink raw reply [flat|nested] 9+ messages in thread