Loading drivers/net/can/at91_can.c +4 −4 Original line number Original line Diff line number Diff line Loading @@ -643,7 +643,7 @@ static void at91_read_msg(struct net_device *dev, unsigned int mb) * * * The first message goes into mb nr. 1 and issues an interrupt. All * The first message goes into mb nr. 1 and issues an interrupt. All * rx ints are disabled in the interrupt handler and a napi poll is * rx ints are disabled in the interrupt handler and a napi poll is * scheduled. We read the mailbox, but do _not_ reenable the mb (to * scheduled. We read the mailbox, but do _not_ re-enable the mb (to * receive another message). * receive another message). * * * lower mbxs upper * lower mbxs upper Loading @@ -661,13 +661,13 @@ static void at91_read_msg(struct net_device *dev, unsigned int mb) * * * The variable priv->rx_next points to the next mailbox to read a * The variable priv->rx_next points to the next mailbox to read a * message from. As long we're in the lower mailboxes we just read the * message from. As long we're in the lower mailboxes we just read the * mailbox but not reenable it. * mailbox but not re-enable it. * * * With completion of the last of the lower mailboxes, we reenable the * With completion of the last of the lower mailboxes, we re-enable the * whole first group, but continue to look for filled mailboxes in the * whole first group, but continue to look for filled mailboxes in the * upper mailboxes. Imagine the second group like overflow mailboxes, * upper mailboxes. Imagine the second group like overflow mailboxes, * which takes CAN messages if the lower goup is full. While in the * which takes CAN messages if the lower goup is full. While in the * upper group we reenable the mailbox right after reading it. Giving * upper group we re-enable the mailbox right after reading it. Giving * the chip more room to store messages. * the chip more room to store messages. * * * After finishing we look again in the lower group if we've still * After finishing we look again in the lower group if we've still Loading drivers/net/can/cc770/cc770.c +1 −1 Original line number Original line Diff line number Diff line Loading @@ -538,7 +538,7 @@ static int cc770_err(struct net_device *dev, u8 status) priv->can.can_stats.error_warning++; priv->can.can_stats.error_warning++; } } } else { } else { /* Back to error avtive */ /* Back to error active */ cf->can_id |= CAN_ERR_PROT; cf->can_id |= CAN_ERR_PROT; cf->data[2] = CAN_ERR_PROT_ACTIVE; cf->data[2] = CAN_ERR_PROT_ACTIVE; priv->can.state = CAN_STATE_ERROR_ACTIVE; priv->can.state = CAN_STATE_ERROR_ACTIVE; Loading drivers/net/can/cc770/cc770.h +1 −1 Original line number Original line Diff line number Diff line Loading @@ -184,7 +184,7 @@ struct cc770_priv { u8 control_normal_mode; /* Control register for normal mode */ u8 control_normal_mode; /* Control register for normal mode */ u8 cpu_interface; /* CPU interface register */ u8 cpu_interface; /* CPU interface register */ u8 clkout; /* Clock out register */ u8 clkout; /* Clock out register */ u8 bus_config; /* Bus conffiguration register */ u8 bus_config; /* Bus configuration register */ struct sk_buff *tx_skb; struct sk_buff *tx_skb; }; }; Loading drivers/net/can/grcan.c +1 −1 Original line number Original line Diff line number Diff line Loading @@ -1243,7 +1243,7 @@ static int grcan_poll(struct napi_struct *napi, int budget) int rx_budget = budget / 2; int rx_budget = budget / 2; int tx_budget = budget - rx_budget; int tx_budget = budget - rx_budget; /* Half of the budget for receiveing messages */ /* Half of the budget for receiving messages */ rx_work_done = grcan_receive(dev, rx_budget); rx_work_done = grcan_receive(dev, rx_budget); /* Half of the budget for transmitting messages as that can trigger echo /* Half of the budget for transmitting messages as that can trigger echo Loading drivers/net/can/m_can/Kconfig +1 −1 Original line number Original line Diff line number Diff line Loading @@ -20,5 +20,5 @@ config CAN_M_CAN_TCAN4X5X tristate "TCAN4X5X M_CAN device" tristate "TCAN4X5X M_CAN device" help help Say Y here if you want support for Texas Instruments TCAN4x5x Say Y here if you want support for Texas Instruments TCAN4x5x M_CAN controller. This device is a peripherial device that uses the M_CAN controller. This device is a peripheral device that uses the SPI bus for communication. SPI bus for communication. Loading
drivers/net/can/at91_can.c +4 −4 Original line number Original line Diff line number Diff line Loading @@ -643,7 +643,7 @@ static void at91_read_msg(struct net_device *dev, unsigned int mb) * * * The first message goes into mb nr. 1 and issues an interrupt. All * The first message goes into mb nr. 1 and issues an interrupt. All * rx ints are disabled in the interrupt handler and a napi poll is * rx ints are disabled in the interrupt handler and a napi poll is * scheduled. We read the mailbox, but do _not_ reenable the mb (to * scheduled. We read the mailbox, but do _not_ re-enable the mb (to * receive another message). * receive another message). * * * lower mbxs upper * lower mbxs upper Loading @@ -661,13 +661,13 @@ static void at91_read_msg(struct net_device *dev, unsigned int mb) * * * The variable priv->rx_next points to the next mailbox to read a * The variable priv->rx_next points to the next mailbox to read a * message from. As long we're in the lower mailboxes we just read the * message from. As long we're in the lower mailboxes we just read the * mailbox but not reenable it. * mailbox but not re-enable it. * * * With completion of the last of the lower mailboxes, we reenable the * With completion of the last of the lower mailboxes, we re-enable the * whole first group, but continue to look for filled mailboxes in the * whole first group, but continue to look for filled mailboxes in the * upper mailboxes. Imagine the second group like overflow mailboxes, * upper mailboxes. Imagine the second group like overflow mailboxes, * which takes CAN messages if the lower goup is full. While in the * which takes CAN messages if the lower goup is full. While in the * upper group we reenable the mailbox right after reading it. Giving * upper group we re-enable the mailbox right after reading it. Giving * the chip more room to store messages. * the chip more room to store messages. * * * After finishing we look again in the lower group if we've still * After finishing we look again in the lower group if we've still Loading
drivers/net/can/cc770/cc770.c +1 −1 Original line number Original line Diff line number Diff line Loading @@ -538,7 +538,7 @@ static int cc770_err(struct net_device *dev, u8 status) priv->can.can_stats.error_warning++; priv->can.can_stats.error_warning++; } } } else { } else { /* Back to error avtive */ /* Back to error active */ cf->can_id |= CAN_ERR_PROT; cf->can_id |= CAN_ERR_PROT; cf->data[2] = CAN_ERR_PROT_ACTIVE; cf->data[2] = CAN_ERR_PROT_ACTIVE; priv->can.state = CAN_STATE_ERROR_ACTIVE; priv->can.state = CAN_STATE_ERROR_ACTIVE; Loading
drivers/net/can/cc770/cc770.h +1 −1 Original line number Original line Diff line number Diff line Loading @@ -184,7 +184,7 @@ struct cc770_priv { u8 control_normal_mode; /* Control register for normal mode */ u8 control_normal_mode; /* Control register for normal mode */ u8 cpu_interface; /* CPU interface register */ u8 cpu_interface; /* CPU interface register */ u8 clkout; /* Clock out register */ u8 clkout; /* Clock out register */ u8 bus_config; /* Bus conffiguration register */ u8 bus_config; /* Bus configuration register */ struct sk_buff *tx_skb; struct sk_buff *tx_skb; }; }; Loading
drivers/net/can/grcan.c +1 −1 Original line number Original line Diff line number Diff line Loading @@ -1243,7 +1243,7 @@ static int grcan_poll(struct napi_struct *napi, int budget) int rx_budget = budget / 2; int rx_budget = budget / 2; int tx_budget = budget - rx_budget; int tx_budget = budget - rx_budget; /* Half of the budget for receiveing messages */ /* Half of the budget for receiving messages */ rx_work_done = grcan_receive(dev, rx_budget); rx_work_done = grcan_receive(dev, rx_budget); /* Half of the budget for transmitting messages as that can trigger echo /* Half of the budget for transmitting messages as that can trigger echo Loading
drivers/net/can/m_can/Kconfig +1 −1 Original line number Original line Diff line number Diff line Loading @@ -20,5 +20,5 @@ config CAN_M_CAN_TCAN4X5X tristate "TCAN4X5X M_CAN device" tristate "TCAN4X5X M_CAN device" help help Say Y here if you want support for Texas Instruments TCAN4x5x Say Y here if you want support for Texas Instruments TCAN4x5x M_CAN controller. This device is a peripherial device that uses the M_CAN controller. This device is a peripheral device that uses the SPI bus for communication. SPI bus for communication.