
From: Esben Nielsen <simlo@phys.au.dk>


Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 25-akpm/include/linux/if_ether.h |    2 +-
 25-akpm/include/linux/net.h      |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff -puN include/linux/if_ether.h~arcnet-fixes-fix include/linux/if_ether.h
--- 25/include/linux/if_ether.h~arcnet-fixes-fix	Mon Nov  1 16:35:25 2004
+++ 25-akpm/include/linux/if_ether.h	Mon Nov  1 16:35:25 2004
@@ -91,7 +91,7 @@
 #define ETH_P_IRDA	0x0017		/* Linux-IrDA			*/
 #define ETH_P_ECONET	0x0018		/* Acorn Econet			*/
 #define ETH_P_HDLC	0x0019		/* HDLC frames			*/
-#define ETH_P_ARCNET	0x0020		/* ArcNet			*/
+#define ETH_P_ARCNET	0x001A		/* 1A for ArcNet :-)            */
 
 /*
  *	This is an Ethernet frame header.
diff -puN include/linux/net.h~arcnet-fixes-fix include/linux/net.h
--- 25/include/linux/net.h~arcnet-fixes-fix	Mon Nov  1 16:35:25 2004
+++ 25-akpm/include/linux/net.h	Mon Nov  1 16:35:25 2004
@@ -26,7 +26,7 @@
 struct poll_table_struct;
 struct inode;
 
-#define NPROTO		33		/* should be enough for now..	*/
+#define NPROTO		32		/* should be enough for now..	*/
 
 #define SYS_SOCKET	1		/* sys_socket(2)		*/
 #define SYS_BIND	2		/* sys_bind(2)			*/
_
