aboutsummaryrefslogtreecommitdiffstats
path: root/net/tipc
diff options
context:
space:
mode:
authorPer Liden <per.liden@ericsson.com>2006-01-16 05:42:12 -0500
committerPer Liden <per.liden@ericsson.com>2006-01-17 18:45:15 -0500
commit33a9c4da5ab16192ef1e961d4c4e45c18031cd67 (patch)
tree825c24cd6cf5700a0c8f6ac1c11a18cb46235d4a /net/tipc
parent7c2b2aaee45c365596a83bcf8758b1f222e0eca4 (diff)
[TIPC] Move ethernet protocol id to linux/if_ether.h
Signed-off-by: Per Liden <per.liden@ericsson.com>
Diffstat (limited to 'net/tipc')
-rw-r--r--net/tipc/eth_media.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/net/tipc/eth_media.c b/net/tipc/eth_media.c
index 2ab6c16280e6..64a880b5935a 100644
--- a/net/tipc/eth_media.c
+++ b/net/tipc/eth_media.c
@@ -41,7 +41,6 @@
41#include <linux/version.h> 41#include <linux/version.h>
42 42
43#define MAX_ETH_BEARERS 2 43#define MAX_ETH_BEARERS 2
44#define TIPC_PROTOCOL 0x88ca
45#define ETH_LINK_PRIORITY TIPC_DEF_LINK_PRI 44#define ETH_LINK_PRIORITY TIPC_DEF_LINK_PRI
46#define ETH_LINK_TOLERANCE TIPC_DEF_LINK_TOL 45#define ETH_LINK_TOLERANCE TIPC_DEF_LINK_TOL
47#define ETH_LINK_WINDOW TIPC_DEF_LINK_WIN 46#define ETH_LINK_WINDOW TIPC_DEF_LINK_WIN
@@ -78,7 +77,7 @@ static int send_msg(struct sk_buff *buf, struct tipc_bearer *tb_ptr,
78 clone->nh.raw = clone->data; 77 clone->nh.raw = clone->data;
79 dev = ((struct eth_bearer *)(tb_ptr->usr_handle))->dev; 78 dev = ((struct eth_bearer *)(tb_ptr->usr_handle))->dev;
80 clone->dev = dev; 79 clone->dev = dev;
81 dev->hard_header(clone, dev, TIPC_PROTOCOL, 80 dev->hard_header(clone, dev, ETH_P_TIPC,
82 &dest->dev_addr.eth_addr, 81 &dest->dev_addr.eth_addr,
83 dev->dev_addr, clone->len); 82 dev->dev_addr, clone->len);
84 dev_queue_xmit(clone); 83 dev_queue_xmit(clone);
@@ -141,7 +140,7 @@ static int enable_bearer(struct tipc_bearer *tb_ptr)
141 return -EDQUOT; 140 return -EDQUOT;
142 if (!eb_ptr->dev) { 141 if (!eb_ptr->dev) {
143 eb_ptr->dev = dev; 142 eb_ptr->dev = dev;
144 eb_ptr->tipc_packet_type.type = __constant_htons(TIPC_PROTOCOL); 143 eb_ptr->tipc_packet_type.type = __constant_htons(ETH_P_TIPC);
145 eb_ptr->tipc_packet_type.dev = dev; 144 eb_ptr->tipc_packet_type.dev = dev;
146 eb_ptr->tipc_packet_type.func = recv_msg; 145 eb_ptr->tipc_packet_type.func = recv_msg;
147 eb_ptr->tipc_packet_type.af_packet_priv = eb_ptr; 146 eb_ptr->tipc_packet_type.af_packet_priv = eb_ptr;