* Patch by John Kerl, 19 Apr 2004:

  Use U-boot's miiphy.h for PHY register names, rather than
  introducing a new header file.

* Update pci_ids.h from linux-2.4.26

* Patch by Masami Komiya, 19 Apr 2004:
  Fix problem cause by VLAN function on little endian architecture
  without VLAN environment

1 files changed, 2 insertions, 2 deletions

diff --git a/net/net.c b/net/net.c
index c9874587ea..6e0288dc06 100644
--- a/net/net.c
+++ b/net/net.c
@@ -1613,14 +1613,14 @@ ushort string_to_VLAN(char *s)
 	ushort id;
 
 	if (s == NULL)
-		return VLAN_NONE;
+		return htons(VLAN_NONE);
 
 	if (*s < '0' || *s > '9')
 		id = VLAN_NONE;
 	else
 		id = (ushort)simple_strtoul(s, NULL, 10);
 
-	return id;
+	return htons(id);
 }
 
 void print_IPaddr (IPaddr_t x)