Skip site navigation (1)Skip section navigation (2) 
Date:      Tue, 10 Jan 2017 18:39:54 +0000 (UTC)
From:      Navdeep Parhar <np@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r311880 - in head/sys/dev: cxgb/ulp/iw_cxgb cxgbe/iw_cxgbe
Message-ID:  <201701101839.v0AIdss9018853@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: np
Date: Tue Jan 10 18:39:53 2017
New Revision: 311880
URL: https://svnweb.freebsd.org/changeset/base/311880

Log:
  The iw_cxgb and iw_cxgbe drivers should not use a FreeBSD device_t where
  a linuxkpi style device is expected.  If OFED/linuxkpi actually starts
  using this field then we'll have to figure out whether to create fake
  devices for these drivers or have linuxkpi deal with NULL device.
  
  This mismatch was first reported as part of D6585.

Modified:
  head/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.c
  head/sys/dev/cxgbe/iw_cxgbe/provider.c

Modified: head/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.c
==============================================================================
--- head/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.c	Tue Jan 10 17:05:34 2017	(r311879)
+++ head/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.c	Tue Jan 10 18:39:53 2017	(r311880)
@@ -1094,7 +1094,7 @@ int iwch_register_device(struct iwch_dev
 	memcpy(dev->ibdev.node_desc, IWCH_NODE_DESC, sizeof(IWCH_NODE_DESC));
 	dev->ibdev.phys_port_cnt = sc->params.nports;
 	dev->ibdev.num_comp_vectors = 1;
-	dev->ibdev.dma_device = dev->rdev.adap->dev;
+	dev->ibdev.dma_device = NULL;
 	dev->ibdev.query_device = iwch_query_device;
 	dev->ibdev.query_port = iwch_query_port;
 	dev->ibdev.modify_port = iwch_modify_port;

Modified: head/sys/dev/cxgbe/iw_cxgbe/provider.c
==============================================================================
--- head/sys/dev/cxgbe/iw_cxgbe/provider.c	Tue Jan 10 17:05:34 2017	(r311879)
+++ head/sys/dev/cxgbe/iw_cxgbe/provider.c	Tue Jan 10 18:39:53 2017	(r311880)
@@ -429,7 +429,7 @@ c4iw_register_device(struct c4iw_dev *de
 	strlcpy(ibdev->node_desc, C4IW_NODE_DESC, sizeof(ibdev->node_desc));
 	ibdev->phys_port_cnt = sc->params.nports;
 	ibdev->num_comp_vectors = 1;
-	ibdev->dma_device = sc->dev;
+	ibdev->dma_device = NULL;
 	ibdev->query_device = c4iw_query_device;
 	ibdev->query_port = c4iw_query_port;
 	ibdev->modify_port = c4iw_modify_port;

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701101839.v0AIdss9018853>