commit 33a9c4da5ab16192ef1e961d4c4e45c18031cd67
author Per Liden <per.liden@ericsson.com> Mon Jan 16 11:42:12 2006 +0100
committer Per Liden <per.liden@ericsson.com> Wed Jan 18 00:45:15 2006 +0100
tree 825c24cd6cf5700a0c8f6ac1c11a18cb46235d4a
parent 7c2b2aaee45c365596a83bcf8758b1f222e0eca4

[TIPC] Move ethernet protocol id to linux/if_ether.h

Signed-off-by: Per Liden <per.liden@ericsson.com>

net/tipc/eth_media.c

diff --git a/net/tipc/eth_media.c b/net/tipc/eth_media.c
index 2ab6c16..64a880b 100644
--- a/net/tipc/eth_media.c
+++ b/net/tipc/eth_media.c
@@ -41,7 +41,6 @@
 #include <linux/version.h>
 
 #define MAX_ETH_BEARERS		2
-#define TIPC_PROTOCOL		0x88ca
 #define ETH_LINK_PRIORITY	TIPC_DEF_LINK_PRI
 #define ETH_LINK_TOLERANCE	TIPC_DEF_LINK_TOL
 #define ETH_LINK_WINDOW		TIPC_DEF_LINK_WIN
@@ -78,7 +77,7 @@
 		clone->nh.raw = clone->data;
 		dev = ((struct eth_bearer *)(tb_ptr->usr_handle))->dev;
 		clone->dev = dev;
-		dev->hard_header(clone, dev, TIPC_PROTOCOL, 
+		dev->hard_header(clone, dev, ETH_P_TIPC, 
 				 &dest->dev_addr.eth_addr,
 				 dev->dev_addr, clone->len);
 		dev_queue_xmit(clone);
@@ -141,7 +140,7 @@
 		return -EDQUOT;
 	if (!eb_ptr->dev) {
 		eb_ptr->dev = dev;
-		eb_ptr->tipc_packet_type.type = __constant_htons(TIPC_PROTOCOL);
+		eb_ptr->tipc_packet_type.type = __constant_htons(ETH_P_TIPC);
 		eb_ptr->tipc_packet_type.dev = dev;
 		eb_ptr->tipc_packet_type.func = recv_msg;
 		eb_ptr->tipc_packet_type.af_packet_priv = eb_ptr;