Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 55e924cf authored by Milind Arun Choudhary's avatar Milind Arun Choudhary Committed by Jeff Garzik
Browse files

ixgb: ROUND_UP macro cleanup in drivers/net/ixgb 



IXGB_ROUNDUP macro cleanup ,use ALIGN

Signed-off-by: default avatarMilind Arun Choudhary <milindchoudhary@gmail.com>
Signed-off-by: default avatarAuke Kok <auke-jan.h.kok@intel.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 9099cfb9

drivers/net/ixgb/ixgb.h

+0 −3
Original line number Original line Diff line number Diff line
@@ -111,9 +111,6 @@ struct ixgb_adapter; 
/* How many Rx Buffers do we bundle into one write to the hardware ? */

/* How many Rx Buffers do we bundle into one write to the hardware ? */

#define IXGB_RX_BUFFER_WRITE	8	/* Must be power of 2 */

#define IXGB_RX_BUFFER_WRITE	8	/* Must be power of 2 */





/* only works for sizes that are powers of 2 */

#define IXGB_ROUNDUP(i, size) ((i) = (((i) + (size) - 1) & ~((size) - 1)))



/* wrapper around a pointer to a socket buffer,

/* wrapper around a pointer to a socket buffer,

 * so a DMA handle can be stored along with the buffer */

 * so a DMA handle can be stored along with the buffer */

struct ixgb_buffer {

struct ixgb_buffer {

drivers/net/ixgb/ixgb_ethtool.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -577,11 +577,11 @@ ixgb_set_ringparam(struct net_device *netdev, 




	rxdr->count = max(ring->rx_pending,(uint32_t)MIN_RXD);

	rxdr->count = max(ring->rx_pending,(uint32_t)MIN_RXD);

	rxdr->count = min(rxdr->count,(uint32_t)MAX_RXD);

	rxdr->count = min(rxdr->count,(uint32_t)MAX_RXD);

	IXGB_ROUNDUP(rxdr->count, IXGB_REQ_RX_DESCRIPTOR_MULTIPLE); 

	rxdr->count = ALIGN(rxdr->count, IXGB_REQ_RX_DESCRIPTOR_MULTIPLE);





	txdr->count = max(ring->tx_pending,(uint32_t)MIN_TXD);

	txdr->count = max(ring->tx_pending,(uint32_t)MIN_TXD);

	txdr->count = min(txdr->count,(uint32_t)MAX_TXD);

	txdr->count = min(txdr->count,(uint32_t)MAX_TXD);

	IXGB_ROUNDUP(txdr->count, IXGB_REQ_TX_DESCRIPTOR_MULTIPLE); 

	txdr->count = ALIGN(txdr->count, IXGB_REQ_TX_DESCRIPTOR_MULTIPLE);





	if(netif_running(adapter->netdev)) {

	if(netif_running(adapter->netdev)) {

		/* Try to get new resources before deleting old */

		/* Try to get new resources before deleting old */

drivers/net/ixgb/ixgb_main.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -685,7 +685,7 @@ ixgb_setup_tx_resources(struct ixgb_adapter *adapter) 
	/* round up to nearest 4K */

	/* round up to nearest 4K */





	txdr->size = txdr->count * sizeof(struct ixgb_tx_desc);

	txdr->size = txdr->count * sizeof(struct ixgb_tx_desc);

	IXGB_ROUNDUP(txdr->size, 4096);

	txdr->size = ALIGN(txdr->size, 4096);





	txdr->desc = pci_alloc_consistent(pdev, txdr->size, &txdr->dma);

	txdr->desc = pci_alloc_consistent(pdev, txdr->size, &txdr->dma);

	if(!txdr->desc) {

	if(!txdr->desc) {
@@ -774,7 +774,7 @@ ixgb_setup_rx_resources(struct ixgb_adapter *adapter) 
	/* Round up to nearest 4K */

	/* Round up to nearest 4K */





	rxdr->size = rxdr->count * sizeof(struct ixgb_rx_desc);

	rxdr->size = rxdr->count * sizeof(struct ixgb_rx_desc);

	IXGB_ROUNDUP(rxdr->size, 4096);

	rxdr->size = ALIGN(rxdr->size, 4096);





	rxdr->desc = pci_alloc_consistent(pdev, rxdr->size, &rxdr->dma);

	rxdr->desc = pci_alloc_consistent(pdev, rxdr->size, &rxdr->dma);

drivers/net/ixgb/ixgb_param.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -282,7 +282,7 @@ ixgb_check_options(struct ixgb_adapter *adapter) 
		} else {

		} else {

			tx_ring->count = opt.def;

			tx_ring->count = opt.def;

		}

		}

		IXGB_ROUNDUP(tx_ring->count, IXGB_REQ_TX_DESCRIPTOR_MULTIPLE);

		tx_ring->count = ALIGN(tx_ring->count, IXGB_REQ_TX_DESCRIPTOR_MULTIPLE);

	}

	}

	{ /* Receive Descriptor Count */

	{ /* Receive Descriptor Count */

		struct ixgb_option opt = {

		struct ixgb_option opt = {
@@ -301,7 +301,7 @@ ixgb_check_options(struct ixgb_adapter *adapter) 
		} else {

		} else {

			rx_ring->count = opt.def;

			rx_ring->count = opt.def;

		}

		}

		IXGB_ROUNDUP(rx_ring->count, IXGB_REQ_RX_DESCRIPTOR_MULTIPLE);

		rx_ring->count = ALIGN(rx_ring->count, IXGB_REQ_RX_DESCRIPTOR_MULTIPLE);

	}

	}

	{ /* Receive Checksum Offload Enable */

	{ /* Receive Checksum Offload Enable */

		struct ixgb_option opt = {

		struct ixgb_option opt = {