Skip to content

Commit

Permalink
Merge pull request #435 from eugeneia/documentation-fixes-amendment
Browse files Browse the repository at this point in the history
Documentation fixes amendments
  • Loading branch information
eugeneia committed Apr 1, 2015
2 parents c4f5776 + b9a47d6 commit 7fbd27c
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 10 deletions.
7 changes: 5 additions & 2 deletions src/apps/solarflare/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,11 @@
## Solarflare (apps.solarflare.solarflare)

The `Solarflare` app drives one port of a Solarflare SFN7 Ethernet
controller. Packets taken from the `rx` port are transmitted onto the
network. Packets received from the network are put on the `tx` port.
controller. Multiple instances of the Solarflare app can be instantiated
on the same PCI device. Packets received from the network will be
dispatched between apps based on destination MAC address and VLAN.
Packets taken from the `rx` port are transmitted onto the network.
Packets received from the network are put on the `tx` port.

![Solarflare](.images/Solarflare.png)

Expand Down
7 changes: 5 additions & 2 deletions src/apps/solarflare/README.md.src
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,11 @@
## Solarflare (apps.solarflare.solarflare)

The `Solarflare` app drives one port of a Solarflare SFN7 Ethernet
controller. Packets taken from the `rx` port are transmitted onto the
network. Packets received from the network are put on the `tx` port.
controller. Multiple instances of the Solarflare app can be instantiated
on the same PCI device. Packets received from the network will be
dispatched between apps based on destination MAC address and VLAN.
Packets taken from the `rx` port are transmitted onto the network.
Packets received from the network are put on the `tx` port.

DIAGRAM: Solarflare
+------------+
Expand Down
4 changes: 1 addition & 3 deletions src/lib/protocol/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -741,6 +741,4 @@ Combined payload accessor and setter method. Returns a pointer to the
datagram payload and its byte size.

If *pointer* and *length* are supplied then *length* bytes starting from
*pointer* are appended to the datagram's payload. The caller has to
ensure that the underlying packet has enough free space to accommodate
for *length* additional bytes.
*pointer* are appended to the datagram's payload.
4 changes: 1 addition & 3 deletions src/lib/protocol/README.md.src
Original file line number Diff line number Diff line change
Expand Up @@ -754,6 +754,4 @@ Combined payload accessor and setter method. Returns a pointer to the
datagram payload and its byte size.

If *pointer* and *length* are supplied then *length* bytes starting from
*pointer* are appended to the datagram's payload. The caller has to
ensure that the underlying packet has enough free space to accommodate
for *length* additional bytes.
*pointer* are appended to the datagram's payload.

0 comments on commit 7fbd27c

Please sign in to comment.