1 files changed, 4 insertions, 51 deletions

diff --git a/net/tipc/port.h b/net/tipc/port.h
index cf4ca5b1d9a4..3087da39ee47 100644
--- a/net/tipc/port.h
+++ b/net/tipc/port.h
@@ -53,17 +53,13 @@
  * @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
- * @conn_unacked: number of unacknowledged messages received from peer port
  * @published: non-zero if port has one or more associated names
- * @congested: non-zero if cannot send because of link or port congestion
  * @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
  * @wait_list: adjacent ports in list of ports waiting on link congestion
  * @waiting_pkts:
- * @sent: # of non-empty messages sent by port
- * @acked: # of non-empty message acknowledgements from connected port's peer
  * @publications: list of publications for port
  * @pub_count: total # of publications port has made during its lifetime
  * @probing_state:
@@ -76,17 +72,13 @@ struct tipc_port {
         int connected;
         u32 conn_type;
         u32 conn_instance;
-        u32 conn_unacked;
         int published;
-        u32 congested;
         u32 max_pkt;
         u32 ref;
         struct tipc_msg phdr;
         struct list_head port_list;
         struct list_head wait_list;
         u32 waiting_pkts;
-        u32 sent;
-        u32 acked;
         struct list_head publications;
         u32 pub_count;
         u32 probing_state;
@@ -104,8 +96,6 @@ struct tipc_port_list;
 u32 tipc_port_init(struct tipc_port *p_ptr,
                    const unsigned int importance);
 
-int tipc_reject_msg(struct sk_buff *buf, u32 err);
-
 void tipc_acknowledge(u32 port_ref, u32 ack);
 
 void tipc_port_destroy(struct tipc_port *p_ptr);
@@ -122,8 +112,6 @@ int tipc_port_disconnect(u32 portref);
 
 int tipc_port_shutdown(u32 ref);
 
-void tipc_port_wakeup(struct tipc_port *port);
-
 /*
  * The following routines require that the port be locked on entry
  */
@@ -132,39 +120,7 @@ int __tipc_port_connect(u32 ref, struct tipc_port *p_ptr,
                    struct tipc_portid const *peer);
 int tipc_port_peer_msg(struct tipc_port *p_ptr, struct tipc_msg *msg);
 
-/*
- * TIPC messaging routines
- */
-
-int tipc_send(struct tipc_port *port,
-              struct iovec const *msg_sect,
-              unsigned int len);
-
-int tipc_send2name(struct tipc_port *port,
-                   struct tipc_name const *name,
-                   u32 domain,
-                   struct iovec const *msg_sect,
-                   unsigned int len);
-
-int tipc_send2port(struct tipc_port *port,
-                   struct tipc_portid const *dest,
-                   struct iovec const *msg_sect,
-                   unsigned int len);
-
-int tipc_port_mcast_xmit(struct tipc_port *port,
-                         struct tipc_name_seq const *seq,
-                         struct iovec const *msg,
-                         unsigned int len);
-
-int tipc_port_iovec_reject(struct tipc_port *p_ptr,
-                           struct tipc_msg *hdr,
-                           struct iovec const *msg_sect,
-                           unsigned int len,
-                           int err);
-
 struct sk_buff *tipc_port_get_ports(void);
-void tipc_port_proto_rcv(struct sk_buff *buf);
-void tipc_port_mcast_rcv(struct sk_buff *buf, struct tipc_port_list *dp);
 void tipc_port_reinit(void);
 
 /**
@@ -185,12 +141,6 @@ static inline void tipc_port_unlock(struct tipc_port *p_ptr)
         spin_unlock_bh(p_ptr->lock);
 }
 
-static inline int tipc_port_congested(struct tipc_port *p_ptr)
-{
-        return ((p_ptr->sent - p_ptr->acked) >= TIPC_FLOWCTRL_WIN);
-}
-
-
 static inline u32 tipc_port_peernode(struct tipc_port *p_ptr)
 {
         return msg_destnode(&p_ptr->phdr);
@@ -229,9 +179,12 @@ static inline int tipc_port_importance(struct tipc_port *port)
         return msg_importance(&port->phdr);
 }
 
-static inline void tipc_port_set_importance(struct tipc_port *port, int imp)
+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