Commit 4d572545 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'Documentation-networking-eliminate-doubled-words'



Randy Dunlap says:

====================
Documentation: networking: eliminate doubled words

Drop all duplicated words in Documentation/networking/ files.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents d7bf2ebe e54ac95a
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -434,7 +434,7 @@ can set up your network then:
	ifconfig arc0 insight
	route add insight arc0
	route add freedom arc0	/* I would use the subnet here (like I said
					to to in "single protocol" above),
					to in "single protocol" above),
					but the rest of the subnet
					unfortunately lies across the PPP
					link on freedom, which confuses
+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ AX.25

To use the amateur radio protocols within Linux you will need to get a
suitable copy of the AX.25 Utilities. More detailed information about
AX.25, NET/ROM and ROSE, associated programs and and utilities can be
AX.25, NET/ROM and ROSE, associated programs and utilities can be
found on http://www.linux-ax25.org.

There is an active mailing list for discussing Linux amateur radio matters
+2 −2
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ UCAN_COMMAND_SET_BITTIMING

*Host2Dev; mandatory*

Setup bittiming by sending the the structure
Setup bittiming by sending the structure
``ucan_ctl_payload_t.cmd_set_bittiming`` (see ``struct bittiming`` for
details)

@@ -232,7 +232,7 @@ UCAN_IN_TX_COMPLETE
  zero

The CAN device has sent a message to the CAN bus. It answers with a
list of of tuples <echo-ids, flags>.
list of tuples <echo-ids, flags>.

The echo-id identifies the frame from (echos the id from a previous
UCAN_OUT_TX message). The flag indicates the result of the
+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ Ethernet switch.
Networking stack hooks
----------------------

When a master netdev is used with DSA, a small hook is placed in in the
When a master netdev is used with DSA, a small hook is placed in the
networking stack is in order to have the DSA subsystem process the Ethernet
switch specific tagging protocol. DSA accomplishes this by registering a
specific (and fake) Ethernet type (later becoming ``skb->protocol``) with the
+1 −1
Original line number Diff line number Diff line
@@ -741,7 +741,7 @@ tcp_fastopen - INTEGER

	Default: 0x1

	Note that that additional client or server features are only
	Note that additional client or server features are only
	effective if the basic support (0x1 and 0x2) are enabled respectively.

tcp_fastopen_blackhole_timeout_sec - INTEGER
Loading