Skip to content

Commit

Permalink
Merge tag 'linux-can-fixes-for-3.15-20140401' of git://gitorious.org/…
Browse files Browse the repository at this point in the history
…linux-can/linux-can

linux-can-fixes-for-3.15-20140401

Marc Kleine-Budde says:

====================
this is a pull request of 16 patches for the 3.15 release cycle.

Bjorn Van Tilt contributes a patch which fixes a memory leak in usb_8dev's
usb_8dev_start_xmit()s error path. A patch by Robert Schwebel fixes a typo in
the can documentation. The remaining patches all target the c_can driver. Two
of them are by me; they add a missing netif_napi_del() and return value
checking. Thomas Gleixner contributes 12 patches, which address several
shortcomings in the driver like hardware initialisation, concurrency, message
ordering and poor performance.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
David S. Miller committed Apr 1, 2014
2 parents 7f1f605 + b1d8e43 commit f91ca78
Show file tree
Hide file tree
Showing 5 changed files with 266 additions and 162 deletions.
2 changes: 1 addition & 1 deletion Documentation/networking/can.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1017,7 +1017,7 @@ solution for a couple of reasons:
in case of a bus-off condition after the specified delay time
in milliseconds. By default it's off.

"bitrate 125000 sample_point 0.875"
"bitrate 125000 sample-point 0.875"
Shows the real bit-rate in bits/sec and the sample-point in the
range 0.000..0.999. If the calculation of bit-timing parameters
is enabled in the kernel (CONFIG_CAN_CALC_BITTIMING=y), the
Expand Down
Loading

0 comments on commit f91ca78

Please sign in to comment.