networking: introduce and use skb_put_data()

[mirror_ubuntu-artful-kernel.git] / drivers / net / caif / caif_serial.c

diff --git a/drivers/net/caif/caif_serial.c b/drivers/net/caif/caif_serial.c
index c2dea4916e5d720bb29814153f302ec364fe4f61..5c57be2082bacf484d1621c7bc4aac09a3fb1bf2 100644 (file)
--- a/drivers/net/caif/caif_serial.c
+++ b/drivers/net/caif/caif_serial.c
@@ -198,8 +198,7 @@ static void ldisc_receive(struct tty_struct *tty, const u8 *data,
        skb = netdev_alloc_skb(ser->dev, count+1);
        if (skb == NULL)
                return;
-       p = skb_put(skb, count);
-       memcpy(p, data, count);
+       p = skb_put_data(skb, data, count);
 
        skb->protocol = htons(ETH_P_CAIF);
        skb_reset_mac_header(skb);
@@ -428,7 +427,7 @@ static void caifdev_setup(struct net_device *dev)
        dev->flags = IFF_POINTOPOINT | IFF_NOARP;
        dev->mtu = CAIF_MAX_MTU;
        dev->priv_flags |= IFF_NO_QUEUE;
-       dev->destructor = free_netdev;
+       dev->needs_free_netdev = true;
        skb_queue_head_init(&serdev->head);
        serdev->common.link_select = CAIF_LINK_LOW_LATENCY;
        serdev->common.use_frag = true;