Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[linux.git] / net / smc / smc.h

diff --git a/net/smc/smc.h b/net/smc/smc.h
index adbdf195eb085f5507444340fb1f8ddcb69548d5..878313f8d6c1772849d0877f50e4190d9fe2170b 100644 (file)
--- a/net/smc/smc.h
+++ b/net/smc/smc.h
@@ -190,18 +190,11 @@ struct smc_connection {
        u64                     peer_token;     /* SMC-D token of peer */
 };
 
-struct smc_connect_info {
-       int                     flags;
-       int                     alen;
-       struct sockaddr         addr;
-};
-
 struct smc_sock {                              /* smc sock container */
        struct sock             sk;
        struct socket           *clcsock;       /* internal tcp socket */
        struct smc_connection   conn;           /* smc connection */
        struct smc_sock         *listen_smc;    /* listen parent */
-       struct smc_connect_info *connect_info;  /* connect address & flags */
        struct work_struct      connect_work;   /* handle non-blocking connect*/
        struct work_struct      tcp_listen_work;/* handle tcp socket accepts */
        struct work_struct      smc_listen_work;/* prepare new accept socket */
@@ -219,6 +212,10 @@ struct smc_sock {                          /* smc sock container */
                                                 * started, waiting for unsent
                                                 * data to be sent
                                                 */
+       u8                      connect_nonblock : 1;
+                                               /* non-blocking connect in
+                                                * flight
+                                                */
        struct mutex            clcsock_release_lock;
                                                /* protects clcsock of a listen
                                                 * socket