a6bf70f792
When we try to add new inline functions in the code, we sometimes run into circular include dependencies. The main problem is that the file core.h, which really should be at the root of the dependency chain, instead is a leaf. I.e., core.h includes a number of header files that themselves should be allowed to include core.h. In reality this is unnecessary, because core.h does not need to know the full signature of any of the structs it refers to, only their type declaration. In this commit, we remove all dependencies from core.h towards any other tipc header file. As a consequence of this change, we can now move the function tipc_own_addr(net) from addr.c to addr.h, and make it inline. There are no functional changes in this commit. Reviewed-by: Erik Hugne <erik.hugne@ericsson.com> Reviewed-by: Ying Xue <ying.xue@windriver.com> Signed-off-by: Jon Maloy <jon.maloy@ericsson.com> Signed-off-by: David S. Miller <davem@davemloft.net>
77 lines
2.8 KiB
C
77 lines
2.8 KiB
C
/*
|
|
* net/tipc/addr.h: Include file for TIPC address utility routines
|
|
*
|
|
* Copyright (c) 2000-2006, Ericsson AB
|
|
* Copyright (c) 2004-2005, 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.
|
|
*/
|
|
|
|
#ifndef _TIPC_ADDR_H
|
|
#define _TIPC_ADDR_H
|
|
|
|
#include <linux/types.h>
|
|
#include <linux/tipc.h>
|
|
#include <net/net_namespace.h>
|
|
#include <net/netns/generic.h>
|
|
#include "core.h"
|
|
|
|
#define TIPC_ZONE_MASK 0xff000000u
|
|
#define TIPC_CLUSTER_MASK 0xfffff000u
|
|
|
|
static inline u32 tipc_own_addr(struct net *net)
|
|
{
|
|
struct tipc_net *tn = net_generic(net, tipc_net_id);
|
|
|
|
return tn->own_addr;
|
|
}
|
|
|
|
static inline u32 tipc_zone_mask(u32 addr)
|
|
{
|
|
return addr & TIPC_ZONE_MASK;
|
|
}
|
|
|
|
static inline u32 tipc_cluster_mask(u32 addr)
|
|
{
|
|
return addr & TIPC_CLUSTER_MASK;
|
|
}
|
|
|
|
u32 tipc_own_addr(struct net *net);
|
|
int in_own_cluster(struct net *net, u32 addr);
|
|
int in_own_cluster_exact(struct net *net, u32 addr);
|
|
int in_own_node(struct net *net, u32 addr);
|
|
u32 addr_domain(struct net *net, u32 sc);
|
|
int tipc_addr_domain_valid(u32);
|
|
int tipc_addr_node_valid(u32 addr);
|
|
int tipc_in_scope(u32 domain, u32 addr);
|
|
int tipc_addr_scope(u32 domain);
|
|
char *tipc_addr_string_fill(char *string, u32 addr);
|
|
#endif
|