Merge branch 'linux-2.6' into for-2.6.22

1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/isdn/hysdn/hysdn_sched.c b/drivers/isdn/hysdn/hysdn_sched.c
index b7b5aa4748a0..81db4a190d41 100644
--- a/drivers/isdn/hysdn/hysdn_sched.c
+++ b/drivers/isdn/hysdn/hysdn_sched.c
@@ -113,7 +113,8 @@ hysdn_sched_tx(hysdn_card *card, unsigned char *buf,
             (skb = hysdn_tx_netget(card)) != NULL) 
         {
                 if (skb->len <= maxlen) {
-                        memcpy(buf, skb->data, skb->len);       /* copy the packet to the buffer */
+                        /* copy the packet to the buffer */
+                        skb_copy_from_linear_data(skb, buf, skb->len);
                         *len = skb->len;
                         *chan = CHAN_NDIS_DATA;
                         card->net_tx_busy = 1;  /* we are busy sending network data */
@@ -126,7 +127,7 @@ hysdn_sched_tx(hysdn_card *card, unsigned char *buf,
             ((skb = hycapi_tx_capiget(card)) != NULL) )
         {
                 if (skb->len <= maxlen) {
-                        memcpy(buf, skb->data, skb->len);
+                        skb_copy_from_linear_data(skb, buf, skb->len);
                         *len = skb->len;
                         *chan = CHAN_CAPI;
                         hycapi_tx_capiack(card);