mirror of
https://github.com/torvalds/linux
synced 2024-11-05 18:23:50 +00:00
e4d050cbf7
Currently TIPC supports two L2 media types, Ethernet and Infiniband. Because both these media are accessed through the common net_device API, several functions in the two media adaptation files turn out to be fully or almost identical, leading to unnecessary code duplication. In this commit we extract this common code from the two media files and move them to the generic bearer.c. Additionally, we change the function names to reflect their real role: to access L2 media, irrespective of type. Signed-off-by: Ying Xue <ying.xue@windriver.com> Cc: Patrick McHardy <kaber@trash.net> Reviewed-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: Jon Maloy <jon.maloy@ericsson.com> Signed-off-by: David S. Miller <davem@davemloft.net>
88 lines
3.3 KiB
C
88 lines
3.3 KiB
C
/*
|
|
* net/tipc/eth_media.c: Ethernet bearer support for TIPC
|
|
*
|
|
* Copyright (c) 2001-2007, 2013, Ericsson AB
|
|
* Copyright (c) 2005-2008, 2011-2013, Wind River Systems
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions are met:
|
|
*
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
* 3. Neither the names of the copyright holders nor the names of its
|
|
* contributors may be used to endorse or promote products derived from
|
|
* this software without specific prior written permission.
|
|
*
|
|
* Alternatively, this software may be distributed under the terms of the
|
|
* GNU General Public License ("GPL") version 2 as published by the Free
|
|
* Software Foundation.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
|
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
|
|
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
|
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
|
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
|
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
|
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
|
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
|
* POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
#include "core.h"
|
|
#include "bearer.h"
|
|
|
|
#define ETH_ADDR_OFFSET 4 /* message header offset of MAC address */
|
|
|
|
/* convert Ethernet address to string */
|
|
static int tipc_eth_addr2str(struct tipc_media_addr *a, char *str_buf,
|
|
int str_size)
|
|
{
|
|
if (str_size < 18) /* 18 = strlen("aa:bb:cc:dd:ee:ff\0") */
|
|
return 1;
|
|
|
|
sprintf(str_buf, "%pM", a->value);
|
|
return 0;
|
|
}
|
|
|
|
/* convert Ethernet address format to message header format */
|
|
static int tipc_eth_addr2msg(struct tipc_media_addr *a, char *msg_area)
|
|
{
|
|
memset(msg_area, 0, TIPC_MEDIA_ADDR_SIZE);
|
|
msg_area[TIPC_MEDIA_TYPE_OFFSET] = TIPC_MEDIA_TYPE_ETH;
|
|
memcpy(msg_area + ETH_ADDR_OFFSET, a->value, ETH_ALEN);
|
|
return 0;
|
|
}
|
|
|
|
/* convert message header address format to Ethernet format */
|
|
static int tipc_eth_msg2addr(const struct tipc_bearer *tb_ptr,
|
|
struct tipc_media_addr *a, char *msg_area)
|
|
{
|
|
if (msg_area[TIPC_MEDIA_TYPE_OFFSET] != TIPC_MEDIA_TYPE_ETH)
|
|
return 1;
|
|
|
|
tipc_l2_media_addr_set(tb_ptr, a, msg_area + ETH_ADDR_OFFSET);
|
|
return 0;
|
|
}
|
|
|
|
/* Ethernet media registration info */
|
|
struct tipc_media eth_media_info = {
|
|
.send_msg = tipc_l2_send_msg,
|
|
.enable_media = tipc_enable_l2_media,
|
|
.disable_media = tipc_disable_l2_media,
|
|
.addr2str = tipc_eth_addr2str,
|
|
.addr2msg = tipc_eth_addr2msg,
|
|
.msg2addr = tipc_eth_msg2addr,
|
|
.priority = TIPC_DEF_LINK_PRI,
|
|
.tolerance = TIPC_DEF_LINK_TOL,
|
|
.window = TIPC_DEF_LINK_WIN,
|
|
.type_id = TIPC_MEDIA_TYPE_ETH,
|
|
.hwaddr_len = ETH_ALEN,
|
|
.name = "eth"
|
|
};
|
|
|