Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm

[pandora-kernel.git] / net / tipc / port.h

diff --git a/net/tipc/port.h b/net/tipc/port.h
index 839f100..e5f8c16 100644 (file)
--- a/net/tipc/port.h
+++ b/net/tipc/port.h
@@ -1,8 +1,8 @@
 /*
  * net/tipc/port.h: Include file for TIPC port code
- * 
- * Copyright (c) 1994-2006, Ericsson AB
- * Copyright (c) 2004-2005, Wind River Systems
+ *
+ * Copyright (c) 1994-2007, Ericsson AB
+ * Copyright (c) 2004-2007, Wind River Systems
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -52,17 +52,17 @@
  * <various callback routines>
  * @uport_list: adjacent user ports in list of ports held by user
  */
- 
+
 struct user_port {
        u32 user_ref;
-       void *usr_handle; 
+       void *usr_handle;
        u32 ref;
-       tipc_msg_err_event err_cb; 
-       tipc_named_msg_err_event named_err_cb; 
-       tipc_conn_shutdown_event conn_err_cb; 
-       tipc_msg_event msg_cb; 
-       tipc_named_msg_event named_msg_cb; 
-       tipc_conn_msg_event conn_msg_cb; 
+       tipc_msg_err_event err_cb;
+       tipc_named_msg_err_event named_err_cb;
+       tipc_conn_shutdown_event conn_err_cb;
+       tipc_msg_event msg_cb;
+       tipc_named_msg_event named_msg_cb;
+       tipc_conn_msg_event conn_msg_cb;
        tipc_continue_event continue_event_cb;
        struct list_head uport_list;
 };
@@ -81,7 +81,6 @@ struct user_port {
  * @acked:
  * @publications: list of publications for port
  * @pub_count: total # of publications port has made during its lifetime
- * @max_pkt: maximum packet size "hint" used when building messages sent by port
  * @probing_state:
  * @probing_interval:
  * @last_in_seqno:
@@ -102,7 +101,6 @@ struct port {
        u32 acked;
        struct list_head publications;
        u32 pub_count;
-       u32 max_pkt;
        u32 probing_state;
        u32 probing_interval;
        u32 last_in_seqno;
@@ -113,7 +111,7 @@ struct port {
 extern spinlock_t tipc_port_list_lock;
 struct port_list;
 
-int tipc_port_recv_sections(struct port *p_ptr, u32 num_sect, 
+int tipc_port_recv_sections(struct port *p_ptr, u32 num_sect,
                            struct iovec const *msg_sect);
 int tipc_port_reject_sections(struct port *p_ptr, struct tipc_msg *hdr,
                              struct iovec const *msg_sect, u32 num_sect,
@@ -133,9 +131,9 @@ static inline struct port *tipc_port_lock(u32 ref)
        return (struct port *)tipc_ref_lock(ref);
 }
 
-/** 
+/**
  * tipc_port_unlock - unlock a port instance
- * 
+ *
  * Can use pointer instead of tipc_ref_unlock() since port is already locked.
  */
 
@@ -164,7 +162,7 @@ static inline int tipc_port_congested(struct port *p_ptr)
        return((p_ptr->sent - p_ptr->acked) >= (TIPC_FLOW_CONTROL_WIN * 2));
 }
 
-/** 
+/**
  * tipc_port_recv_msg - receive message from lower layer and deliver to port user
  */
 
@@ -175,7 +173,7 @@ static inline int tipc_port_recv_msg(struct sk_buff *buf)
        u32 destport = msg_destport(msg);
        u32 dsz = msg_data_sz(msg);
        u32 err;
-       
+
        /* forward unresolved named message */
        if (unlikely(!destport)) {
                tipc_net_route_msg(buf);