Changeset db96017 in mainline for uspace/lib/net/generic/protocol_map.c

Timestamp:

2012-04-07T17:41:44Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

b6913b7

Parents:

b69e4c0 (diff), 6bb169b5 (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 mainline changes.

File:

• uspace/lib/net/generic/protocol_map.c (modified) (3 diffs)

uspace/lib/net/generic/protocol_map.c

@@ -50 +50 @@
         switch (nil) {
         case SERVICE_ETHERNET:
-        case SERVICE_NE2000:
+        case SERVICE_NILDUMMY:
                 switch (il) {
                 case SERVICE_IP:
@@ -76 +76 @@
         switch (nil) {
         case SERVICE_ETHERNET:
-        case SERVICE_NE2000:
+        case SERVICE_NILDUMMY:
                 switch (protocol) {
                 case ETH_P_IP:
@@ -139 +139 @@
         switch (nil) {
         case SERVICE_ETHERNET:
-        case SERVICE_NE2000:
                 return HW_ETHER;
         default: