path: root/Documentation/networking
diff options
authorLinus Torvalds <>2015-02-11 13:03:11 -0800
committerLinus Torvalds <>2015-02-11 13:03:11 -0800
commit73b4f63aebd6d57db4ca1d31fa6f8516651207b0 (patch)
tree49adf7fb3b8f45d040f7e633ba34040541279c28 /Documentation/networking
parentbfe9183fdcc0575a648d1401facc649888a1f49a (diff)
parent52e68924dfa8d9de5d82f6798352eecc5f03a97d (diff)
Merge tag 'docs-for-linus' of git://
Pull documentation updates from Jonathan Corbet: "Highlights this time around include: - A thrashing of SubmittingPatches to bring it out of the "send everything to Linus" era of kernel development. - A new document on completions from Nicholas McGuire - Lots of typo fixes, formatting improvements, corrections, build fixes, and more" * tag 'docs-for-linus' of git:// (35 commits) Documentation: Fix the wrong command `echo -1 > set_ftrace_pid` for cleaning the filter. can-doc: Fixed a wrong filepath in can.txt Documentation: Fix trivial typo in comment. kgdb,docs: Fix typo and minor style issues Documentation: add description for FTRACE probe status doc: brief user documentation for completion Documentation/misc-devices/mei: Fix indentation of embedded code. Documentation/misc-devices/mei: Fix indentation of enumeration. Documentation/misc-devices/mei: Fix spacing around parentheses. Documentation/misc-devices/mei: Fix formatting of headings. Documentation: devicetree: Fix double words in Doumentation/devicetree Documentation: mm: Fix typo in vm.txt lockstat: Add documentation on contention and contenting points Documentation: fix blackfin gptimers-example build errors Fixes column alignment in table of contents entry 1.9 in Documentation/filesystems/proc.txt CodingStyle: enable emacs display of trailing whitespace DocBook: Do not exceed argument list limit gpio: board.txt: Fix the gpio name example Documentation/SubmittingPatches: unify whitespace/tabs for the DCO MAINTAINERS: Add the docs-next git tree to the maintainer entry ...
Diffstat (limited to 'Documentation/networking')
2 files changed, 7 insertions, 3 deletions
diff --git a/Documentation/networking/00-INDEX b/Documentation/networking/00-INDEX
index 557b6ef70c26..df27a1a50776 100644
--- a/Documentation/networking/00-INDEX
+++ b/Documentation/networking/00-INDEX
@@ -1,7 +1,5 @@
- this file
- - information on the 3Com EtherLink Plus (3c505) driver.
- information on the 3Com Etherlink III Series Ethernet cards.
@@ -24,6 +22,8 @@ README.sb1000
- info on General Instrument/NextLevel SURFboard1000 cable modem.
- info on using alias network devices.
+ - Altera Triple-Speed Ethernet controller.
- tons of info on ARCnet, hubs, jumper settings for ARCnet cards, etc.
@@ -42,6 +42,8 @@ bridge.txt
- where to get user space programs for ethernet bridging with Linux.
- documentation on CAN protocol family.
+ - 3G/LTE USB modem (Mobile Broadband Interface Model)
- info on the COPS LocalTalk Linux driver
@@ -54,6 +56,8 @@ cxgb.txt
- Release Notes for the Chelsio N210 Linux device driver.
- the Datagram Congestion Control Protocol (DCCP) (RFC 4340..42).
+ - DataCenter TCP congestion control
- the Digital EtherWORKS DE4?? and DE5?? PCI Ethernet driver
diff --git a/Documentation/networking/can.txt b/Documentation/networking/can.txt
index 2236d6dcb7da..0a2859a8ee7e 100644
--- a/Documentation/networking/can.txt
+++ b/Documentation/networking/can.txt
@@ -234,7 +234,7 @@ solution for a couple of reasons:
mechanisms. Inside this filter definition the (interested) type of
errors may be selected. The reception of error messages is disabled
by default. The format of the CAN error message frame is briefly
- described in the Linux header file "include/linux/can/error.h".
+ described in the Linux header file "include/uapi/linux/can/error.h".
4. How to use SocketCAN