mac80211: fix propagation of failed hardware reconfigurations

[safe/jmp/linux-2.6] / net / rds / rds.h

diff --git a/net/rds/rds.h b/net/rds/rds.h
index 0604007..85d6f89 100644 (file)
--- a/net/rds/rds.h
+++ b/net/rds/rds.h
@@ -28,6 +28,10 @@
  */
 #define RDS_PORT       18634
 
+#ifdef ATOMIC64_INIT
+#define KERNEL_HAS_ATOMIC64
+#endif
+
 #ifdef DEBUG
 #define rdsdebug(fmt, args...) pr_debug("%s(): " fmt, __func__ , ##args)
 #else
@@ -128,7 +132,7 @@ struct rds_connection {
 #define RDS_FLAG_CONG_BITMAP   0x01
 #define RDS_FLAG_ACK_REQUIRED  0x02
 #define RDS_FLAG_RETRANSMITTED 0x04
-#define RDS_MAX_ADV_CREDIT     127
+#define RDS_MAX_ADV_CREDIT     255
 
 /*
  * Maximum space available for extension headers.
@@ -307,11 +311,17 @@ struct rds_notifier {
  *                flag and header.
  */
 
+#define RDS_TRANS_IB   0
+#define RDS_TRANS_IWARP        1
+#define RDS_TRANS_TCP  2
+#define RDS_TRANS_COUNT        3
+
 struct rds_transport {
        char                    t_name[TRANSNAMSIZ];
        struct list_head        t_item;
        struct module           *t_owner;
        unsigned int            t_prefer_loopback:1;
+       unsigned int            t_type;
 
        int (*laddr_check)(__be32 addr);
        int (*conn_alloc)(struct rds_connection *conn, gfp_t gfp);
@@ -634,7 +644,7 @@ struct rds_message *rds_send_get_message(struct rds_connection *,
 void rds_rdma_unuse(struct rds_sock *rs, u32 r_key, int force);
 
 /* stats.c */
-DECLARE_PER_CPU(struct rds_statistics, rds_stats);
+DECLARE_PER_CPU_SHARED_ALIGNED(struct rds_statistics, rds_stats);
 #define rds_stats_inc_which(which, member) do {                \
        per_cpu(which, get_cpu()).member++;             \
        put_cpu();                                      \
@@ -648,7 +658,8 @@ DECLARE_PER_CPU(struct rds_statistics, rds_stats);
 int __init rds_stats_init(void);
 void rds_stats_exit(void);
 void rds_stats_info_copy(struct rds_info_iterator *iter,
-                        uint64_t *values, char **names, size_t nr);
+                        uint64_t *values, const char *const *names,
+                        size_t nr);
 
 /* sysctl.c */
 int __init rds_sysctl_init(void);