btrfs: pass struct btrfs_io_geometry to set_io_stripe

[linux-2.6-microblaze.git] / include / net / tls.h

diff --git a/include/net/tls.h b/include/net/tls.h
index 5e71dd3..962f0c5 100644 (file)
--- a/include/net/tls.h
+++ b/include/net/tls.h
@@ -51,16 +51,6 @@
 
 struct tls_rec;
 
-struct tls_cipher_size_desc {
-       unsigned int iv;
-       unsigned int key;
-       unsigned int salt;
-       unsigned int tag;
-       unsigned int rec_seq;
-};
-
-extern const struct tls_cipher_size_desc tls_cipher_size_desc[];
-
 /* Maximum data size carried in a TLS record */
 #define TLS_MAX_PAYLOAD_SIZE           ((size_t)1 << 14)
 
@@ -69,13 +59,10 @@ extern const struct tls_cipher_size_desc tls_cipher_size_desc[];
 
 #define TLS_CRYPTO_INFO_READY(info)    ((info)->cipher_type)
 
-#define TLS_RECORD_TYPE_ALERT          0x15
-#define TLS_RECORD_TYPE_HANDSHAKE      0x16
-#define TLS_RECORD_TYPE_DATA           0x17
-
 #define TLS_AAD_SPACE_SIZE             13
 
-#define MAX_IV_SIZE                    16
+#define TLS_MAX_IV_SIZE                        16
+#define TLS_MAX_SALT_SIZE              4
 #define TLS_TAG_SIZE                   16
 #define TLS_MAX_REC_SEQ_SIZE           8
 #define TLS_MAX_AAD_SIZE               TLS_AAD_SPACE_SIZE
@@ -163,6 +150,7 @@ struct tls_record_info {
        skb_frag_t frags[MAX_SKB_FRAGS];
 };
 
+#define TLS_DRIVER_STATE_SIZE_TX       16
 struct tls_offload_context_tx {
        struct crypto_aead *aead_send;
        spinlock_t lock;        /* protects records list */
@@ -176,17 +164,13 @@ struct tls_offload_context_tx {
        void (*sk_destruct)(struct sock *sk);
        struct work_struct destruct_work;
        struct tls_context *ctx;
-       u8 driver_state[] __aligned(8);
        /* The TLS layer reserves room for driver specific state
         * Currently the belief is that there is not enough
         * driver specific state to justify another layer of indirection
         */
-#define TLS_DRIVER_STATE_SIZE_TX       16
+       u8 driver_state[TLS_DRIVER_STATE_SIZE_TX] __aligned(8);
 };
 
-#define TLS_OFFLOAD_CONTEXT_SIZE_TX                                            \
-       (sizeof(struct tls_offload_context_tx) + TLS_DRIVER_STATE_SIZE_TX)
-
 enum tls_context_flags {
        /* tls_device_down was called after the netdev went down, device state
         * was released, and kTLS works in software, even though rx_conf is
@@ -207,8 +191,8 @@ enum tls_context_flags {
 };
 
 struct cipher_context {
-       char *iv;
-       char *rec_seq;
+       char iv[TLS_MAX_IV_SIZE + TLS_MAX_SALT_SIZE];
+       char rec_seq[TLS_MAX_REC_SEQ_SIZE];
 };
 
 union tls_crypto_context {
@@ -316,6 +300,7 @@ struct tls_offload_resync_async {
        u32 log[TLS_DEVICE_RESYNC_ASYNC_LOGMAX];
 };
 
+#define TLS_DRIVER_STATE_SIZE_RX       8
 struct tls_offload_context_rx {
        /* sw must be the first member of tls_offload_context_rx */
        struct tls_sw_context_rx sw;
@@ -339,17 +324,13 @@ struct tls_offload_context_rx {
                        struct tls_offload_resync_async *resync_async;
                };
        };
-       u8 driver_state[] __aligned(8);
        /* The TLS layer reserves room for driver specific state
         * Currently the belief is that there is not enough
         * driver specific state to justify another layer of indirection
         */
-#define TLS_DRIVER_STATE_SIZE_RX       8
+       u8 driver_state[TLS_DRIVER_STATE_SIZE_RX] __aligned(8);
 };
 
-#define TLS_OFFLOAD_CONTEXT_SIZE_RX                                    \
-       (sizeof(struct tls_offload_context_rx) + TLS_DRIVER_STATE_SIZE_RX)
-
 struct tls_record_info *tls_get_record(struct tls_offload_context_tx *context,
                                       u32 seq, u64 *p_record_sn);