X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=net%2Fnetrom%2Fnr_in.c;h=6d4ef6d65b3df789d3eb4b3449df1fd1f2a5ced3;hb=0bfb82449c9c98a8cfb1f0f886b5b0c7f7b0ff1a;hp=5560acbaaa9548d78feabbd877370b1fb214a2c7;hpb=920841d8d1d61bc12b43f95a579a5374f6d98f81;p=mv-sheeva.git

diff --git a/net/netrom/nr_in.c b/net/netrom/nr_in.c
index 5560acbaaa9..6d4ef6d65b3 100644
--- a/net/netrom/nr_in.c
+++ b/net/netrom/nr_in.c
@@ -16,6 +16,7 @@
 #include <linux/string.h>
 #include <linux/sockios.h>
 #include <linux/net.h>
+#include <linux/slab.h>
 #include <net/ax25.h>
 #include <linux/inet.h>
 #include <linux/netdevice.h>
@@ -51,10 +52,12 @@ static int nr_queue_rx_frame(struct sock *sk, struct sk_buff *skb, int more)
 		if ((skbn = alloc_skb(nr->fraglen, GFP_ATOMIC)) == NULL)
 			return 1;
 
-		skbn->h.raw = skbn->data;
+		skb_reset_transport_header(skbn);
 
 		while ((skbo = skb_dequeue(&nr->frag_queue)) != NULL) {
-			memcpy(skb_put(skbn, skbo->len), skbo->data, skbo->len);
+			skb_copy_from_linear_data(skbo,
+						  skb_put(skbn, skbo->len),
+						  skbo->len);
 			kfree_skb(skbo);
 		}