Skip to content

L
linux-davinci-2.6.23
Commit 33a9c4da authored by Per Liden's avatar Per Liden
Browse files
Options

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

Signed-off-by: default avatarPer Liden <per.liden@ericsson.com>
parent 7c2b2aae
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
include/linux/if_ether.h
View file @ 33a9c4da
...@@ -72,6 +72,7 @@ ...@@ -72,6 +72,7 @@
* over Ethernet * over Ethernet
*/ */
#define ETH_P_AOE 0x88A2 /* ATA 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. * Non DIX types. Won't clash for 1500 types.
......
net/tipc/eth_media.c
View file @ 33a9c4da
...@@ -41,7 +41,6 @@ ...@@ -41,7 +41,6 @@
#include <linux/version.h> #include <linux/version.h>
#define MAX_ETH_BEARERS 2 #define MAX_ETH_BEARERS 2
#define TIPC_PROTOCOL 0x88ca
#define ETH_LINK_PRIORITY TIPC_DEF_LINK_PRI #define ETH_LINK_PRIORITY TIPC_DEF_LINK_PRI
#define ETH_LINK_TOLERANCE TIPC_DEF_LINK_TOL #define ETH_LINK_TOLERANCE TIPC_DEF_LINK_TOL
#define ETH_LINK_WINDOW TIPC_DEF_LINK_WIN #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,7 +77,7 @@ static int send_msg(struct sk_buff *buf, struct tipc_bearer *tb_ptr,
clone->nh.raw = clone->data; clone->nh.raw = clone->data;
dev = ((struct eth_bearer *)(tb_ptr->usr_handle))->dev; dev = ((struct eth_bearer *)(tb_ptr->usr_handle))->dev;
clone->dev = dev; clone->dev = dev;
dev->hard_header(clone, dev, TIPC_PROTOCOL, dev->hard_header(clone, dev, ETH_P_TIPC,
&dest->dev_addr.eth_addr, &dest->dev_addr.eth_addr,
dev->dev_addr, clone->len); dev->dev_addr, clone->len);
dev_queue_xmit(clone); dev_queue_xmit(clone);
...@@ -141,7 +140,7 @@ static int enable_bearer(struct tipc_bearer *tb_ptr) ...@@ -141,7 +140,7 @@ static int enable_bearer(struct tipc_bearer *tb_ptr)
return -EDQUOT; return -EDQUOT;
if (!eb_ptr->dev) { if (!eb_ptr->dev) {
eb_ptr->dev = 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.dev = dev;
eb_ptr->tipc_packet_type.func = recv_msg; eb_ptr->tipc_packet_type.func = recv_msg;
eb_ptr->tipc_packet_type.af_packet_priv = eb_ptr; eb_ptr->tipc_packet_type.af_packet_priv = eb_ptr;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment