can: provide library functions for skb allocation

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

diff --git a/kernel/2.6/drivers/net/can/mscan/mscan.c b/kernel/2.6/drivers/net/can/mscan/mscan.c
index 51556f9f0e1b4c0e62bc66043c347af7dbfb62b0..e5d5004d74185886d6f1a53800b0c733a27d535f 100644 (file)
--- a/kernel/2.6/drivers/net/can/mscan/mscan.c
+++ b/kernel/2.6/drivers/net/can/mscan/mscan.c
@@ -46,6 +46,7 @@ RCSID("$Id$");
 #define MSCAN_INIT_MODE                (MSCAN_INITRQ | MSCAN_SLPRQ)
 #define MSCAN_POWEROFF_MODE    (MSCAN_CSWAI | MSCAN_SLPRQ)
 #define MSCAN_SET_MODE_RETRIES 255
+#define MSCAN_ECHO_SKB_MAX     3
 
 #define BTR0_BRP_MASK          0x3f
 #define BTR0_SJW_SHIFT         6
@@ -98,6 +99,7 @@ struct mscan_priv {
        u8 shadow_statflg;
        u8 shadow_canrier;
        u8 cur_pri;
+       u8 prev_buf_id;
        u8 tx_active;
 
        struct list_head tx_head;
@@ -200,6 +202,7 @@ static int mscan_start(struct net_device *dev)
        out_8(&regs->canrier, 0);
 
        INIT_LIST_HEAD(&priv->tx_head);
+       priv->prev_buf_id = 0;
        priv->cur_pri = 0;
        priv->tx_active = 0;
        priv->shadow_canrier = 0;
@@ -222,7 +225,11 @@ static int mscan_start(struct net_device *dev)
        return 0;
 }
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,32)
 static int mscan_start_xmit(struct sk_buff *skb, struct net_device *dev)
+#else
+static netdev_tx_t mscan_start_xmit(struct sk_buff *skb, struct net_device *dev)
+#endif
 {
        struct can_frame *frame = (struct can_frame *)skb->data;
        struct mscan_regs *regs = (struct mscan_regs *)dev->base_addr;
@@ -245,14 +252,19 @@ static int mscan_start_xmit(struct sk_buff *skb, struct net_device *dev)
        case 1:
                /* if buf_id < 3, then current frame will be send out of order,
                   since  buffer with lower id have higher priority (hell..) */
-               if (buf_id < 3)
-                       priv->cur_pri++;
-               if (priv->cur_pri == 0xff)
-                       set_bit(F_TX_WAIT_ALL, &priv->flags);
                netif_stop_queue(dev);
        case 2:
+               if (buf_id < priv->prev_buf_id) {
+                       priv->cur_pri++;
+                       if (priv->cur_pri == 0xff) {
+                               set_bit(F_TX_WAIT_ALL, &priv->flags);
+                               netif_stop_queue(dev);
+                       }
+               }
                set_bit(F_TX_PROGRESS, &priv->flags);
+               break;
        }
+       priv->prev_buf_id = buf_id;
        out_8(&regs->cantbsel, i);
 
        rtr = frame->can_id & CAN_RTR_FLAG;
@@ -352,7 +364,7 @@ static int mscan_rx_poll(struct net_device *dev, int *budget)
        while (npackets < quota && ((canrflg = in_8(&regs->canrflg)) &
                                    (MSCAN_RXF | MSCAN_ERR_IF))) {
 
-               skb = dev_alloc_skb(sizeof(struct can_frame));
+               skb = alloc_can_skb(dev, &frame);
                if (!skb) {
                        if (printk_ratelimit())
                                dev_notice(ND2D(dev), "packet dropped\n");
@@ -361,9 +373,6 @@ static int mscan_rx_poll(struct net_device *dev, int *budget)
                        continue;
                }
 
-               frame = (struct can_frame *)skb_put(skb, sizeof(*frame));
-               memset(frame, 0, sizeof(*frame));
-
                if (canrflg & MSCAN_RXF) {
                        can_id = in_be16(&regs->rx.idr1_0);
                        if (can_id & (1 << 3)) {
@@ -392,7 +401,9 @@ static int mscan_rx_poll(struct net_device *dev, int *budget)
                        }
 
                        out_8(&regs->canrflg, MSCAN_RXF);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,32)
                        dev->last_rx = jiffies;
+#endif
                        stats->rx_packets++;
                        stats->rx_bytes += frame->can_dlc;
                } else if (canrflg & MSCAN_ERR_IF) {
@@ -445,9 +456,6 @@ static int mscan_rx_poll(struct net_device *dev, int *budget)
                }
 
                npackets++;
-               skb->dev = dev;
-               skb->protocol = __constant_htons(ETH_P_CAN);
-               skb->ip_summed = CHECKSUM_UNNECESSARY;
                netif_receive_skb(skb);
        }
 
@@ -716,7 +724,7 @@ struct net_device *alloc_mscandev(void)
        struct mscan_priv *priv;
        int i;
 
-       dev = alloc_candev(sizeof(struct mscan_priv));
+       dev = alloc_candev(sizeof(struct mscan_priv), MSCAN_ECHO_SKB_MAX);
        if (!dev)
                return NULL;
        priv = netdev_priv(dev);