can: provide library functions for skb allocation

[socketcan-devel.git] / kernel / 2.6 / drivers / net / can / softing / softing_main.c

diff --git a/kernel/2.6/drivers/net/can/softing/softing_main.c b/kernel/2.6/drivers/net/can/softing/softing_main.c
index 8d807346f11dbbade4b2aef99de7c1fad2381be7..043ff56f19a6fbe3b3129b7f67f2b33d47381379 100644 (file)
--- a/kernel/2.6/drivers/net/can/softing/softing_main.c
+++ b/kernel/2.6/drivers/net/can/softing/softing_main.c
@@ -143,16 +143,14 @@ int softing_rx(struct net_device *netdev, const struct can_frame *msg,
        ktime_t ktime)
 {
        struct sk_buff *skb;
+       struct can_frame *cf;
        int ret;
        struct net_device_stats *stats;
 
-       skb = dev_alloc_skb(sizeof(msg));
+       skb = alloc_can_skb(netdev, &cf);
        if (!skb)
                return -ENOMEM;
-       skb->dev = netdev;
-       skb->protocol = htons(ETH_P_CAN);
-       skb->ip_summed = CHECKSUM_UNNECESSARY;
-       memcpy(skb_put(skb, sizeof(*msg)), msg, sizeof(*msg));
+       memcpy(cf, msg, sizeof(*msg));
        skb->tstamp = ktime;
        ret = netif_rx(skb);
        if (ret == NET_RX_DROP) {