From owner-svn-src-projects@freebsd.org Fri Nov 24 12:05:51 2017 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6CF14DE2C69 for ; Fri, 24 Nov 2017 12:05:51 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 369D571EDC; Fri, 24 Nov 2017 12:05:51 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAOC5o0W089853; Fri, 24 Nov 2017 12:05:50 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAOC5oHE089850; Fri, 24 Nov 2017 12:05:50 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201711241205.vAOC5oHE089850@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Fri, 24 Nov 2017 12:05:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r326159 - projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/core X-SVN-Group: projects X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/core X-SVN-Commit-Revision: 326159 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Nov 2017 12:05:51 -0000 Author: hselasky Date: Fri Nov 24 12:05:49 2017 New Revision: 326159 URL: https://svnweb.freebsd.org/changeset/base/326159 Log: Compile fix for LINT-NOIP kernel target. Sponsored by: Mellanox Technologies Modified: projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/core/ib_roce_gid_mgmt.c projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/core/ib_ud_header.c projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/core/ib_verbs.c Modified: projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/core/ib_roce_gid_mgmt.c ============================================================================== --- projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/core/ib_roce_gid_mgmt.c Fri Nov 24 11:37:41 2017 (r326158) +++ projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/core/ib_roce_gid_mgmt.c Fri Nov 24 12:05:49 2017 (r326159) @@ -168,7 +168,9 @@ roce_gid_update_addr_callback(struct ib_device *device }; struct ipx_entry *entry; struct net_device *idev; +#if defined(INET) || defined(INET6) struct ifaddr *ifa; +#endif union ib_gid gid; int default_gids; u16 index_num; Modified: projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/core/ib_ud_header.c ============================================================================== --- projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/core/ib_ud_header.c Fri Nov 24 11:37:41 2017 (r326158) +++ projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/core/ib_ud_header.c Fri Nov 24 12:05:49 2017 (r326159) @@ -282,6 +282,7 @@ static const struct ib_field deth_table[] = { __sum16 ib_ud_ip4_csum(struct ib_ud_header *header) { +#if defined(INET) || defined(INET6) struct ip iph; iph.ip_hl = 5; @@ -297,6 +298,9 @@ __sum16 ib_ud_ip4_csum(struct ib_ud_header *header) iph.ip_dst.s_addr = header->ip4.daddr; return in_cksum_hdr(&iph); +#else + return 0; +#endif } EXPORT_SYMBOL(ib_ud_ip4_csum); Modified: projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/core/ib_verbs.c ============================================================================== --- projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/core/ib_verbs.c Fri Nov 24 11:37:41 2017 (r326158) +++ projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/core/ib_verbs.c Fri Nov 24 12:05:49 2017 (r326159) @@ -355,7 +355,9 @@ static int ib_get_header_version(const union rdma_netw */ memcpy(&ip4h_checked, ip4h, sizeof(ip4h_checked)); ip4h_checked.ip_sum = 0; +#if defined(INET) || defined(INET6) ip4h_checked.ip_sum = in_cksum_hdr(&ip4h_checked); +#endif /* if IPv4 header checksum is OK, believe it */ if (ip4h->ip_sum == ip4h_checked.ip_sum) return 4;