Merge tag 's390-6.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

[linux-2.6-microblaze.git] / net / iucv / af_iucv.c

diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
index 4aa1c72..7c8c3ad 100644 (file)
--- a/net/iucv/af_iucv.c
+++ b/net/iucv/af_iucv.c
@@ -1060,12 +1060,12 @@ static int iucv_sock_sendmsg(struct socket *sock, struct msghdr *msg,
                        int i;
 
                        /* skip iucv_array lying in the headroom */
-                       iba[0].address = (u32)virt_to_phys(skb->data);
+                       iba[0].address = virt_to_dma32(skb->data);
                        iba[0].length = (u32)skb_headlen(skb);
                        for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
                                skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
 
-                               iba[i + 1].address = (u32)virt_to_phys(skb_frag_address(frag));
+                               iba[i + 1].address = virt_to_dma32(skb_frag_address(frag));
                                iba[i + 1].length = (u32)skb_frag_size(frag);
                        }
                        err = pr_iucv->message_send(iucv->path, &txmsg,
@@ -1161,12 +1161,12 @@ static void iucv_process_message(struct sock *sk, struct sk_buff *skb,
                        struct iucv_array *iba = (struct iucv_array *)skb->head;
                        int i;
 
-                       iba[0].address = (u32)virt_to_phys(skb->data);
+                       iba[0].address = virt_to_dma32(skb->data);
                        iba[0].length = (u32)skb_headlen(skb);
                        for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
                                skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
 
-                               iba[i + 1].address = (u32)virt_to_phys(skb_frag_address(frag));
+                               iba[i + 1].address = virt_to_dma32(skb_frag_address(frag));
                                iba[i + 1].length = (u32)skb_frag_size(frag);
                        }
                        rc = pr_iucv->message_receive(path, msg,