Commit 49384507 authored by Allan Stephens's avatar Allan Stephens Committed by David S. Miller
Browse files

[TIPC]: Corrected potential misuse of tipc_media_addr structure. 



Signed-off-by: default avatarAllan Stephens <allan.stephens@windriver.com>
Signed-off-by: default avatarPer Liden <per.liden@ericsson.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2535ec50

include/net/tipc/tipc_bearer.h

+10 −2
Original line number Diff line number Diff line
@@ -49,10 +49,18 @@ 


#define TIPC_MEDIA_TYPE_ETH	1



/* 

 * Destination address structure used by TIPC bearers when sending messages

 * 

 * IMPORTANT: The fields of this structure MUST be stored using the specified

 * byte order indicated below, as the structure is exchanged between nodes

 * as part of a link setup process.

 */



struct tipc_media_addr {

	__u32  type;

	__u32  type;			/* bearer type (network byte order) */

	union {

		__u8   eth_addr[6];	/* Ethernet bearer */ 

		__u8   eth_addr[6];	/* 48 bit Ethernet addr (byte array) */ 

#if 0

		/* Prototypes for other possible bearer types */

net/tipc/eth_media.c

+3 −1
Original line number Diff line number Diff line
@@ -254,7 +254,9 @@ int tipc_eth_media_start(void) 
	if (eth_started)

		return -EINVAL;



	memset(&bcast_addr, 0xff, sizeof(bcast_addr));

	bcast_addr.type = htonl(TIPC_MEDIA_TYPE_ETH);

	memset(&bcast_addr.dev_addr, 0xff, ETH_ALEN);



	memset(eth_bearers, 0, sizeof(eth_bearers));



	res = tipc_register_media(TIPC_MEDIA_TYPE_ETH, "eth",