Fix some #includes in CAN drivers (rebased for net-next-2.6)

[net-next-2.6.git] / drivers / net / can / sja1000 / sja1000.c

diff --git a/drivers/net/can/sja1000/sja1000.c b/drivers/net/can/sja1000/sja1000.c
index ace103a44833378aef5d8b5027bb4a1db79ce19f..618c11222abc1537466e6f62c9d41036da7d721b 100644 (file)
--- a/drivers/net/can/sja1000/sja1000.c
+++ b/drivers/net/can/sja1000/sja1000.c
@@ -60,7 +60,6 @@
 #include <linux/skbuff.h>
 #include <linux/delay.h>
 
-#include <linux/can.h>
 #include <linux/can/dev.h>
 #include <linux/can/error.h>
 
@@ -130,8 +129,12 @@ static void set_normal_mode(struct net_device *dev)
                /* check reset bit */
                if ((status & MOD_RM) == 0) {
                        priv->can.state = CAN_STATE_ERROR_ACTIVE;
-                       /* enable all interrupts */
-                       priv->write_reg(priv, REG_IER, IRQ_ALL);
+                       /* enable interrupts */
+                       if (priv->can.ctrlmode & CAN_CTRLMODE_BERR_REPORTING)
+                               priv->write_reg(priv, REG_IER, IRQ_ALL);
+                       else
+                               priv->write_reg(priv, REG_IER,
+                                               IRQ_ALL & ~IRQ_BEI);
                        return;
                }
 
@@ -203,6 +206,17 @@ static int sja1000_set_bittiming(struct net_device *dev)
        return 0;
 }
 
+static int sja1000_get_berr_counter(const struct net_device *dev,
+                                   struct can_berr_counter *bec)
+{
+       struct sja1000_priv *priv = netdev_priv(dev);
+
+       bec->txerr = priv->read_reg(priv, REG_TXERR);
+       bec->rxerr = priv->read_reg(priv, REG_RXERR);
+
+       return 0;
+}
+
 /*
  * initialize SJA1000 chip:
  *   - reset chip
@@ -437,6 +451,8 @@ static int sja1000_err(struct net_device *dev, uint8_t isrc, uint8_t status)
                                CAN_ERR_CRTL_TX_PASSIVE :
                                CAN_ERR_CRTL_RX_PASSIVE;
                }
+               cf->data[6] = txerr;
+               cf->data[7] = rxerr;
        }
 
        priv->can.state = state;
@@ -567,7 +583,9 @@ struct net_device *alloc_sja1000dev(int sizeof_priv)
        priv->can.bittiming_const = &sja1000_bittiming_const;
        priv->can.do_set_bittiming = sja1000_set_bittiming;
        priv->can.do_set_mode = sja1000_set_mode;
-       priv->can.ctrlmode_supported = CAN_CTRLMODE_3_SAMPLES;
+       priv->can.do_get_berr_counter = sja1000_get_berr_counter;
+       priv->can.ctrlmode_supported = CAN_CTRLMODE_3_SAMPLES |
+               CAN_CTRLMODE_BERR_REPORTING;
 
        if (sizeof_priv)
                priv->priv = (void *)priv + sizeof(struct sja1000_priv);