Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 33a9c4da authored by Per Liden's avatar Per Liden
Browse files

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



Signed-off-by: default avatarPer Liden <per.liden@ericsson.com>
parent 7c2b2aae

include/linux/if_ether.h

+1 −0
Original line number Diff line number Diff line
@@ -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.

net/tipc/eth_media.c

+2 −3
Original line number Diff line number Diff line
@@ -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;