sja1000.c (eebc57f73d42095b778e899f6aa90ad050c72655) sja1000.c (61357325f377889a1daffa14962d705dc814dd0e)
1/*
2 * sja1000.c - Philips SJA1000 network device driver
3 *
4 * Copyright (c) 2003 Matthias Brukner, Trajet Gmbh, Rebenring 33,
5 * 38106 Braunschweig, GERMANY
6 *
7 * Copyright (c) 2002-2007 Volkswagen Group Electronic Research
8 * All rights reserved.

--- 224 unchanged lines hidden (view full) ---

233}
234
235/*
236 * transmit a CAN message
237 * message layout in the sk_buff should be like this:
238 * xx xx xx xx ff ll 00 11 22 33 44 55 66 77
239 * [ can-id ] [flags] [len] [can data (up to 8 bytes]
240 */
1/*
2 * sja1000.c - Philips SJA1000 network device driver
3 *
4 * Copyright (c) 2003 Matthias Brukner, Trajet Gmbh, Rebenring 33,
5 * 38106 Braunschweig, GERMANY
6 *
7 * Copyright (c) 2002-2007 Volkswagen Group Electronic Research
8 * All rights reserved.

--- 224 unchanged lines hidden (view full) ---

233}
234
235/*
236 * transmit a CAN message
237 * message layout in the sk_buff should be like this:
238 * xx xx xx xx ff ll 00 11 22 33 44 55 66 77
239 * [ can-id ] [flags] [len] [can data (up to 8 bytes]
240 */
241static int sja1000_start_xmit(struct sk_buff *skb, struct net_device *dev)
241static netdev_tx_t sja1000_start_xmit(struct sk_buff *skb,
242 struct net_device *dev)
242{
243 struct sja1000_priv *priv = netdev_priv(dev);
244 struct net_device_stats *stats = &dev->stats;
245 struct can_frame *cf = (struct can_frame *)skb->data;
246 uint8_t fi;
247 uint8_t dlc;
248 canid_t id;
249 uint8_t dreg;

--- 27 unchanged lines hidden (view full) ---

277
278 stats->tx_bytes += dlc;
279 dev->trans_start = jiffies;
280
281 can_put_echo_skb(skb, dev, 0);
282
283 priv->write_reg(priv, REG_CMR, CMD_TR);
284
243{
244 struct sja1000_priv *priv = netdev_priv(dev);
245 struct net_device_stats *stats = &dev->stats;
246 struct can_frame *cf = (struct can_frame *)skb->data;
247 uint8_t fi;
248 uint8_t dlc;
249 canid_t id;
250 uint8_t dreg;

--- 27 unchanged lines hidden (view full) ---

278
279 stats->tx_bytes += dlc;
280 dev->trans_start = jiffies;
281
282 can_put_echo_skb(skb, dev, 0);
283
284 priv->write_reg(priv, REG_CMR, CMD_TR);
285
285 return 0;
286 return NETDEV_TX_OK;
286}
287
288static void sja1000_rx(struct net_device *dev)
289{
290 struct sja1000_priv *priv = netdev_priv(dev);
291 struct net_device_stats *stats = &dev->stats;
292 struct can_frame *cf;
293 struct sk_buff *skb;

--- 343 unchanged lines hidden --- 		287}
288
289static void sja1000_rx(struct net_device *dev)
290{
291 struct sja1000_priv *priv = netdev_priv(dev);
292 struct net_device_stats *stats = &dev->stats;
293 struct can_frame *cf;
294 struct sk_buff *skb;

--- 343 unchanged lines hidden ---