Merge branch 'parisc-5.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller...

[sfrench/cifs-2.6.git] / drivers / crypto / chelsio / chtls / chtls_io.c

diff --git a/drivers/crypto/chelsio/chtls/chtls_io.c b/drivers/crypto/chelsio/chtls/chtls_io.c
index 18f553fcc1673dda35c0aaf663c0670d7a24e458..1285a1bceda7d248b3d8e8865fc74d731202bfd5 100644 (file)
--- a/drivers/crypto/chelsio/chtls/chtls_io.c
+++ b/drivers/crypto/chelsio/chtls/chtls_io.c
@@ -922,14 +922,13 @@ static int csk_wait_memory(struct chtls_dev *cdev,
                           struct sock *sk, long *timeo_p)
 {
        DEFINE_WAIT_FUNC(wait, woken_wake_function);
-       int sndbuf, err = 0;
+       int err = 0;
        long current_timeo;
        long vm_wait = 0;
        bool noblock;
 
        current_timeo = *timeo_p;
        noblock = (*timeo_p ? false : true);
-       sndbuf = cdev->max_host_sndbuf;
        if (csk_mem_free(cdev, sk)) {
                current_timeo = (prandom_u32() % (HZ / 5)) + 2;
                vm_wait = (prandom_u32() % (HZ / 5)) + 2;
@@ -1401,23 +1400,18 @@ static int chtls_pt_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,
                            int nonblock, int flags, int *addr_len)
 {
        struct chtls_sock *csk = rcu_dereference_sk_user_data(sk);
-       struct net_device *dev = csk->egress_dev;
        struct chtls_hws *hws = &csk->tlshws;
        struct tcp_sock *tp = tcp_sk(sk);
-       struct adapter *adap;
        unsigned long avail;
        int buffers_freed;
        int copied = 0;
-       int request;
        int target;
        long timeo;
 
-       adap = netdev2adap(dev);
        buffers_freed = 0;
 
        timeo = sock_rcvtimeo(sk, nonblock);
        target = sock_rcvlowat(sk, flags & MSG_WAITALL, len);
-       request = len;
 
        if (unlikely(csk_flag(sk, CSK_UPDATE_RCV_WND)))
                chtls_cleanup_rbuf(sk, copied);
@@ -1694,11 +1688,9 @@ int chtls_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,
 {
        struct tcp_sock *tp = tcp_sk(sk);
        struct chtls_sock *csk;
-       struct chtls_hws *hws;
        unsigned long avail;    /* amount of available data in current skb */
        int buffers_freed;
        int copied = 0;
-       int request;
        long timeo;
        int target;             /* Read at least this many bytes */
 
@@ -1718,7 +1710,6 @@ int chtls_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,
 
        lock_sock(sk);
        csk = rcu_dereference_sk_user_data(sk);
-       hws = &csk->tlshws;
 
        if (is_tls_rx(csk))
                return chtls_pt_recvmsg(sk, msg, len, nonblock,
@@ -1726,7 +1717,6 @@ int chtls_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,
 
        timeo = sock_rcvtimeo(sk, nonblock);
        target = sock_rcvlowat(sk, flags & MSG_WAITALL, len);
-       request = len;
 
        if (unlikely(csk_flag(sk, CSK_UPDATE_RCV_WND)))
                chtls_cleanup_rbuf(sk, copied);