We move the inline functions in the file port.h to socket.c, and modify their names accordingly. We move struct tipc_port and some macros to socket.h. Finally, we remove the file port.h. Signed-off-by: Jon Maloy <jon.maloy@ericsson.com> Reviewed-by: Erik Hugne <erik.hugne@ericsson.com> Reviewed-by: Ying Xue <ying.xue@windriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>tirimbino
Jon Paul Maloy
11 years ago
committed by
David S. Miller
parent
0fc87aaebd
commit
2e84c60b77
@ -1,145 +0,0 @@ |
||||
/*
|
||||
* net/tipc/port.h: Include file for TIPC port code |
||||
* |
||||
* Copyright (c) 1994-2007, 2014, Ericsson AB |
||||
* Copyright (c) 2004-2007, 2010-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. |
||||
*/ |
||||
|
||||
#ifndef _TIPC_PORT_H |
||||
#define _TIPC_PORT_H |
||||
|
||||
#include "net.h" |
||||
#include "msg.h" |
||||
#include "node_subscr.h" |
||||
|
||||
#define TIPC_CONNACK_INTV 256 |
||||
#define TIPC_FLOWCTRL_WIN (TIPC_CONNACK_INTV * 2) |
||||
#define TIPC_CONN_OVERLOAD_LIMIT ((TIPC_FLOWCTRL_WIN * 2 + 1) * \ |
||||
SKB_TRUESIZE(TIPC_MAX_USER_MSG_SIZE)) |
||||
|
||||
/**
|
||||
* struct tipc_port - TIPC port structure |
||||
* @lock: pointer to spinlock for controlling access to port |
||||
* @connected: non-zero if port is currently connected to a peer port |
||||
* @conn_type: TIPC type used when connection was established |
||||
* @conn_instance: TIPC instance used when connection was established |
||||
* @published: non-zero if port has one or more associated names |
||||
* @max_pkt: maximum packet size "hint" used when building messages sent by port |
||||
* @ref: unique reference to port in TIPC object registry |
||||
* @phdr: preformatted message header used when sending messages |
||||
* @port_list: adjacent ports in TIPC's global list of ports |
||||
* @publications: list of publications for port |
||||
* @pub_count: total # of publications port has made during its lifetime |
||||
* @probing_state: |
||||
* @probing_interval: |
||||
* @timer_ref: |
||||
*/ |
||||
struct tipc_port { |
||||
int connected; |
||||
u32 conn_type; |
||||
u32 conn_instance; |
||||
int published; |
||||
u32 max_pkt; |
||||
u32 ref; |
||||
struct tipc_msg phdr; |
||||
struct list_head publications; |
||||
u32 pub_count; |
||||
u32 probing_state; |
||||
u32 probing_interval; |
||||
struct timer_list timer; |
||||
}; |
||||
|
||||
/*
|
||||
* TIPC port manipulation routines |
||||
*/ |
||||
u32 tipc_port_init(struct tipc_port *p_ptr, |
||||
const unsigned int importance); |
||||
|
||||
void tipc_port_destroy(struct tipc_port *p_ptr); |
||||
|
||||
int tipc_publish(struct tipc_port *p_ptr, unsigned int scope, |
||||
struct tipc_name_seq const *name_seq); |
||||
|
||||
int tipc_withdraw(struct tipc_port *p_ptr, unsigned int scope, |
||||
struct tipc_name_seq const *name_seq); |
||||
|
||||
int tipc_port_peer_msg(struct tipc_port *p_ptr, struct tipc_msg *msg); |
||||
|
||||
void tipc_port_reinit(void); |
||||
|
||||
static inline u32 tipc_port_peernode(struct tipc_port *p_ptr) |
||||
{ |
||||
return msg_destnode(&p_ptr->phdr); |
||||
} |
||||
|
||||
static inline u32 tipc_port_peerport(struct tipc_port *p_ptr) |
||||
{ |
||||
return msg_destport(&p_ptr->phdr); |
||||
} |
||||
|
||||
static inline bool tipc_port_unreliable(struct tipc_port *port) |
||||
{ |
||||
return msg_src_droppable(&port->phdr) != 0; |
||||
} |
||||
|
||||
static inline void tipc_port_set_unreliable(struct tipc_port *port, |
||||
bool unreliable) |
||||
{ |
||||
msg_set_src_droppable(&port->phdr, unreliable ? 1 : 0); |
||||
} |
||||
|
||||
static inline bool tipc_port_unreturnable(struct tipc_port *port) |
||||
{ |
||||
return msg_dest_droppable(&port->phdr) != 0; |
||||
} |
||||
|
||||
static inline void tipc_port_set_unreturnable(struct tipc_port *port, |
||||
bool unreturnable) |
||||
{ |
||||
msg_set_dest_droppable(&port->phdr, unreturnable ? 1 : 0); |
||||
} |
||||
|
||||
|
||||
static inline int tipc_port_importance(struct tipc_port *port) |
||||
{ |
||||
return msg_importance(&port->phdr); |
||||
} |
||||
|
||||
static inline int tipc_port_set_importance(struct tipc_port *port, int imp) |
||||
{ |
||||
if (imp > TIPC_CRITICAL_IMPORTANCE) |
||||
return -EINVAL; |
||||
msg_set_importance(&port->phdr, (u32)imp); |
||||
return 0; |
||||
} |
||||
|
||||
#endif |
||||
Loading…
Reference in new issue