diff options
Diffstat (limited to 'drivers/s390/net/netiucv.c')
-rw-r--r-- | drivers/s390/net/netiucv.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/s390/net/netiucv.c b/drivers/s390/net/netiucv.c index 82edf2014402..cd42bd54988c 100644 --- a/drivers/s390/net/netiucv.c +++ b/drivers/s390/net/netiucv.c | |||
@@ -689,7 +689,8 @@ static void conn_action_rx(fsm_instance *fi, int event, void *arg) | |||
689 | msg->length, conn->max_buffsize); | 689 | msg->length, conn->max_buffsize); |
690 | return; | 690 | return; |
691 | } | 691 | } |
692 | conn->rx_buff->data = conn->rx_buff->tail = conn->rx_buff->head; | 692 | conn->rx_buff->data = conn->rx_buff->head; |
693 | skb_reset_tail_pointer(conn->rx_buff); | ||
693 | conn->rx_buff->len = 0; | 694 | conn->rx_buff->len = 0; |
694 | rc = iucv_message_receive(conn->path, msg, 0, conn->rx_buff->data, | 695 | rc = iucv_message_receive(conn->path, msg, 0, conn->rx_buff->data, |
695 | msg->length, NULL); | 696 | msg->length, NULL); |
@@ -735,7 +736,8 @@ static void conn_action_txdone(fsm_instance *fi, int event, void *arg) | |||
735 | } | 736 | } |
736 | } | 737 | } |
737 | } | 738 | } |
738 | conn->tx_buff->data = conn->tx_buff->tail = conn->tx_buff->head; | 739 | conn->tx_buff->data = conn->tx_buff->head; |
740 | skb_reset_tail_pointer(conn->tx_buff); | ||
739 | conn->tx_buff->len = 0; | 741 | conn->tx_buff->len = 0; |
740 | spin_lock_irqsave(&conn->collect_lock, saveflags); | 742 | spin_lock_irqsave(&conn->collect_lock, saveflags); |
741 | while ((skb = skb_dequeue(&conn->collect_queue))) { | 743 | while ((skb = skb_dequeue(&conn->collect_queue))) { |
@@ -1164,8 +1166,8 @@ static int netiucv_transmit_skb(struct iucv_connection *conn, | |||
1164 | * Copy the skb to a new allocated skb in lowmem only if the | 1166 | * Copy the skb to a new allocated skb in lowmem only if the |
1165 | * data is located above 2G in memory or tailroom is < 2. | 1167 | * data is located above 2G in memory or tailroom is < 2. |
1166 | */ | 1168 | */ |
1167 | unsigned long hi = | 1169 | unsigned long hi = ((unsigned long)(skb_tail_pointer(skb) + |
1168 | ((unsigned long)(skb->tail + NETIUCV_HDRLEN)) >> 31; | 1170 | NETIUCV_HDRLEN)) >> 31; |
1169 | int copied = 0; | 1171 | int copied = 0; |
1170 | if (hi || (skb_tailroom(skb) < 2)) { | 1172 | if (hi || (skb_tailroom(skb) < 2)) { |
1171 | nskb = alloc_skb(skb->len + NETIUCV_HDRLEN + | 1173 | nskb = alloc_skb(skb->len + NETIUCV_HDRLEN + |