Skip site navigation (1)Skip section navigation (2) 
Date:      Fri, 29 Apr 2016 11:18:49 +0000 (UTC)
From:      Hans Petter Selasky <hselasky@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject:   svn commit: r298778 - stable/10/sys/ofed/drivers/net/mlx4
Message-ID:  <201604291118.u3TBIn8a040395@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: hselasky
Date: Fri Apr 29 11:18:48 2016
New Revision: 298778
URL: https://svnweb.freebsd.org/changeset/base/298778

Log:
  MFC r297968:
  Remove some unused fields.
  
  Sponsored by:	Mellanox Technologies

Modified:
  stable/10/sys/ofed/drivers/net/mlx4/en_netdev.c
  stable/10/sys/ofed/drivers/net/mlx4/en_rx.c
  stable/10/sys/ofed/drivers/net/mlx4/mlx4_en.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/ofed/drivers/net/mlx4/en_netdev.c
==============================================================================
--- stable/10/sys/ofed/drivers/net/mlx4/en_netdev.c	Fri Apr 29 11:17:25 2016	(r298777)
+++ stable/10/sys/ofed/drivers/net/mlx4/en_netdev.c	Fri Apr 29 11:18:48 2016	(r298778)
@@ -1244,10 +1244,6 @@ int mlx4_en_start_port(struct net_device
 	/* Calculate Rx buf size */
 	dev->if_mtu = min(dev->if_mtu, priv->max_mtu);
         mlx4_en_calc_rx_buf(dev);
-	priv->rx_alloc_size = max_t(int, 2 * roundup_pow_of_two(priv->rx_mb_size),
-				    PAGE_SIZE);
-	priv->rx_alloc_order = get_order(priv->rx_alloc_size);
-	priv->rx_buf_size = roundup_pow_of_two(priv->rx_mb_size);
 	en_dbg(DRV, priv, "Rx buf size:%d\n", priv->rx_mb_size);
 
 	/* Configure rx cq's and rings */

Modified: stable/10/sys/ofed/drivers/net/mlx4/en_rx.c
==============================================================================
--- stable/10/sys/ofed/drivers/net/mlx4/en_rx.c	Fri Apr 29 11:17:25 2016	(r298777)
+++ stable/10/sys/ofed/drivers/net/mlx4/en_rx.c	Fri Apr 29 11:18:48 2016	(r298778)
@@ -391,9 +391,6 @@ int mlx4_en_activate_rx_rings(struct mlx
 		ring->cons = 0;
 		ring->actual_size = 0;
 		ring->cqn = priv->rx_cq[ring_ind]->mcq.cqn;
-		ring->rx_alloc_order = priv->rx_alloc_order;
-		ring->rx_alloc_size = priv->rx_alloc_size;
-		ring->rx_buf_size = priv->rx_buf_size;
                 ring->rx_mb_size = priv->rx_mb_size;
 
 		ring->stride = stride;

Modified: stable/10/sys/ofed/drivers/net/mlx4/mlx4_en.h
==============================================================================
--- stable/10/sys/ofed/drivers/net/mlx4/mlx4_en.h	Fri Apr 29 11:17:25 2016	(r298777)
+++ stable/10/sys/ofed/drivers/net/mlx4/mlx4_en.h	Fri Apr 29 11:18:48 2016	(r298778)
@@ -316,9 +316,6 @@ struct mlx4_en_rx_ring {
 	u32 cons;
 	u32 buf_size;
 	u8  fcs_del;
-	u16 rx_alloc_order;
-	u32 rx_alloc_size;
-	u32 rx_buf_size;
 	u32 rx_mb_size;
 	int qpn;
 	u8 *buf;
@@ -557,9 +554,6 @@ struct mlx4_en_priv {
 	u32 tx_ring_num;
 	u32 rx_ring_num;
 	u32 rx_mb_size;
-	u16 rx_alloc_order;
-	u32 rx_alloc_size;
-	u32 rx_buf_size;
 
 	struct mlx4_en_tx_ring **tx_ring;
 	struct mlx4_en_rx_ring *rx_ring[MAX_RX_RINGS];

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