Merge branch 'for-linus' of git://git.infradead.org/ubi-2.6

[linux-2.6-omap-h63xx.git] / drivers / isdn / hysdn / hycapi.c

diff --git a/drivers/isdn/hysdn/hycapi.c b/drivers/isdn/hysdn/hycapi.c
index b2ae4ec1e49e1c1566b4bd5b723608d81c3a361a..f85450146bdcb8e18e8c192199c086f063c1efa1 100644 (file)
--- a/drivers/isdn/hysdn/hycapi.c
+++ b/drivers/isdn/hysdn/hycapi.c
@@ -398,8 +398,9 @@ static u16 hycapi_send_message(struct capi_ctr *ctrl, struct sk_buff *skb)
                        _len = CAPIMSG_LEN(skb->data);
                        if (_len > 22) {
                                _len2 = _len - 22;
-                               memcpy(msghead, skb->data, 22);
-                               memcpy(skb->data + _len2, msghead, 22);
+                               skb_copy_from_linear_data(skb, msghead, 22);
+                               skb_copy_to_linear_data_offset(skb, _len2,
+                                                              msghead, 22);
                                skb_pull(skb, _len2);
                                CAPIMSG_SETLEN(skb->data, 22);
                                retval = capilib_data_b3_req(&cinfo->ncci_head,