[SK_BUFF]: Introduce skb_copy_from_linear_data{_offset}

[net-next-2.6.git] / drivers / isdn / hardware / avm / c4.c

diff --git a/drivers/isdn/hardware/avm/c4.c b/drivers/isdn/hardware/avm/c4.c
index 2a3eb38f0ebb34b84da227a339ab5d78755a2187..d58f927e766a4a95f9c942be039e6ae3071be210 100644 (file)
--- a/drivers/isdn/hardware/avm/c4.c
+++ b/drivers/isdn/hardware/avm/c4.c
@@ -28,8 +28,8 @@
 #include <linux/isdn/capilli.h>
 #include "avmcard.h"
 
-#undef CONFIG_C4_DEBUG
-#undef CONFIG_C4_POLLDEBUG
+#undef AVM_C4_DEBUG
+#undef AVM_C4_POLLDEBUG
 
 /* ------------------------------------------------------------- */
 
@@ -420,7 +420,7 @@ static void c4_dispatch_tx(avmcard *card)
 
        skb = skb_dequeue(&dma->send_queue);
        if (!skb) {
-#ifdef CONFIG_C4_DEBUG
+#ifdef AVM_C4_DEBUG
                printk(KERN_DEBUG "%s: tx underrun\n", card->name);
 #endif
                return;
@@ -444,20 +444,21 @@ static void c4_dispatch_tx(avmcard *card)
                        _put_slice(&p, skb->data, len);
                }
                txlen = (u8 *)p - (u8 *)dma->sendbuf.dmabuf;
-#ifdef CONFIG_C4_DEBUG
+#ifdef AVM_C4_DEBUG
                printk(KERN_DEBUG "%s: tx put msg len=%d\n", card->name, txlen);
 #endif
        } else {
                txlen = skb->len-2;
-#ifdef CONFIG_C4_POLLDEBUG
+#ifdef AVM_C4_POLLDEBUG
                if (skb->data[2] == SEND_POLLACK)
                        printk(KERN_INFO "%s: ack to c4\n", card->name);
 #endif
-#ifdef CONFIG_C4_DEBUG
+#ifdef AVM_C4_DEBUG
                printk(KERN_DEBUG "%s: tx put 0x%x len=%d\n",
                                card->name, skb->data[2], txlen);
 #endif
-               memcpy(dma->sendbuf.dmabuf, skb->data+2, skb->len-2);
+               skb_copy_from_linear_data_offset(skb, 2, dma->sendbuf.dmabuf,
+                                                skb->len - 2);
        }
        txlen = (txlen + 3) & ~3;
 
@@ -508,7 +509,7 @@ static void c4_handle_rx(avmcard *card)
        u32 cidx;
 
 
-#ifdef CONFIG_C4_DEBUG
+#ifdef AVM_C4_DEBUG
        printk(KERN_DEBUG "%s: rx 0x%x len=%lu\n", card->name,
                                b1cmd, (unsigned long)dma->recvlen);
 #endif
@@ -586,7 +587,7 @@ static void c4_handle_rx(avmcard *card)
                break;
 
        case RECEIVE_START:
-#ifdef CONFIG_C4_POLLDEBUG
+#ifdef AVM_C4_POLLDEBUG
                printk(KERN_INFO "%s: poll from c4\n", card->name);
 #endif
                if (!suppress_pollack)