]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
net/rds: Fix new sparse warning
authorDavid Ahern <david.ahern@oracle.com>
Mon, 4 May 2015 15:51:38 +0000 (11:51 -0400)
committerSantosh Shilimkar <santosh.shilimkar@oracle.com>
Thu, 3 Nov 2016 16:46:21 +0000 (09:46 -0700)
c0adf54a109 introduced new sparse warnings:
  CHECK   /home/dahern/kernels/linux.git/net/rds/ib_cm.c
net/rds/ib_cm.c:191:34: warning: incorrect type in initializer (different base types)
net/rds/ib_cm.c:191:34:    expected unsigned long long [unsigned] [usertype] dp_ack_seq
net/rds/ib_cm.c:191:34:    got restricted __be64 <noident>
net/rds/ib_cm.c:194:51: warning: cast to restricted __be64

The temporary variable for sequence number should have been declared as __be64
rather than u64. Make it so.

Orabug: 24817685

Signed-off-by: David Ahern <david.ahern@oracle.com>
Cc: shamir rabinovitch <shamir.rabinovitch@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit e2783717a71e9babfdd7c36c7e35b790d2c01022)
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@oracle.com>
net/rds/ib_cm.c

index eba15ae9e7bad6f300ba661f1907a6755ab3145e..6dcc2877811e51e8d418b6dd62eb538877de3abc 100644 (file)
@@ -348,7 +348,7 @@ void rds_ib_cm_connect_complete(struct rds_connection *conn, struct rdma_cm_even
                 * Since dp_ack_seq is 64-bit extended load operations can be
                 * used so go through get_unaligned to avoid unaligned errors.
                 */
-               u64 dp_ack_seq = get_unaligned(&dp->dp_ack_seq);
+               __be64 dp_ack_seq = get_unaligned(&dp->dp_ack_seq);
 
                if (dp_ack_seq)
                        rds_send_drop_acked(conn, be64_to_cpu(dp_ack_seq),