Changeset 71b00dcc in mainline for uspace/srv/net/include/ethernet_protocols.h

Timestamp:

2010-03-07T22:51:38Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

60ab6c3

Parents:

b5cbff4 (diff), 31c80a5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from lp:~lukasmejdrech/helenos/network.

File:

• uspace/srv/net/include/ethernet_protocols.h (modified) (3 diffs)

uspace/srv/net/include/ethernet_protocols.h

@@ -373 +373 @@
 #define ETH_P_Stanford_V_Kernel_prod            0x805C
 
-/** Evans & Sutherland ethernet protocol type.
+/** Evans &Sutherland ethernet protocol type.
  */
 #define ETH_P_Evans_Sutherland          0x805D
@@ -873 +873 @@
 #define ETH_P_Taurus_Controls_MAX               0x82AB
 
-/** Walker Richer & Quinn ethernet protocol type.
+/** Walker Richer &Quinn ethernet protocol type.
  */
 #define ETH_P_Walker_Richer_Quinn_MIN           0x82AC
 
-/** Walker Richer & Quinn ethernet protocol type.
+/** Walker Richer &Quinn ethernet protocol type.
  */
 #define ETH_P_Walker_Richer_Quinn_MAX           0x8693
@@ -921 +921 @@
 #define ETH_P_ATOMIC            0x86DF
 
-/** Landis & Gyr Powers ethernet protocol type.
+/** Landis &Gyr Powers ethernet protocol type.
  */
 #define ETH_P_Landis_Gyr_Powers_MIN             0x86E0
 
-/** Landis & Gyr Powers ethernet protocol type.
+/** Landis &Gyr Powers ethernet protocol type.
  */
 #define ETH_P_Landis_Gyr_Powers_MAX             0x86EF