diff options
| author | Per Liden <per.liden@ericsson.com> | 2006-01-16 10:42:12 (GMT) |
|---|---|---|
| committer | Per Liden <per.liden@ericsson.com> | 2006-01-17 23:45:15 (GMT) |
| commit | 33a9c4da5ab16192ef1e961d4c4e45c18031cd67 (patch) | |
| tree | 825c24cd6cf5700a0c8f6ac1c11a18cb46235d4a | |
| parent | 7c2b2aaee45c365596a83bcf8758b1f222e0eca4 (diff) | |
| download | linux-33a9c4da5ab16192ef1e961d4c4e45c18031cd67.tar.xz | |
[TIPC] Move ethernet protocol id to linux/if_ether.h
Signed-off-by: Per Liden <per.liden@ericsson.com>
| -rw-r--r-- | include/linux/if_ether.h | 1 | ||||
| -rw-r--r-- | net/tipc/eth_media.c | 5 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/if_ether.h b/include/linux/if_ether.h index fe26d43..7a92c1c 100644 --- a/include/linux/if_ether.h +++ b/include/linux/if_ether.h @@ -72,6 +72,7 @@ * over Ethernet */ #define ETH_P_AOE 0x88A2 /* ATA over Ethernet */ +#define ETH_P_TIPC 0x88CA /* TIPC */ /* * Non DIX types. Won't clash for 1500 types. 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 @@ static int send_msg(struct sk_buff *buf, struct tipc_bearer *tb_ptr, 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 @@ static int enable_bearer(struct tipc_bearer *tb_ptr) 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; |