| Message ID | 4991C46D.3030705@linux.vnet.ibm.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On Tue, 10 Feb 2009, Breno Leitao wrote: > Removing the unused PAGE_USE_COUNT() macro. Also removing the unused pages > variable at ixgbe_configure_rx() function. > > Signed-off-by: Breno Leitão <leitao@linux.vnet.ibm.com> > Signed-off-by: Jay Vosburgh <fubar@us.ibm.com> Acked-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
From: "Waskiewicz Jr, Peter P" <peter.p.waskiewicz.jr@intel.com> Date: Tue, 10 Feb 2009 17:21:12 -0800 (Pacific Standard Time) > On Tue, 10 Feb 2009, Breno Leitao wrote: > > > Removing the unused PAGE_USE_COUNT() macro. Also removing the unused pages > > variable at ixgbe_configure_rx() function. > > > > Signed-off-by: Breno Leitão <leitao@linux.vnet.ibm.com> > > Signed-off-by: Jay Vosburgh <fubar@us.ibm.com> > > Acked-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com> Applied, thanks everyone. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c index a3572d1..8c32c18 100644 --- a/drivers/net/ixgbe/ixgbe_main.c +++ b/drivers/net/ixgbe/ixgbe_main.c @@ -1553,9 +1553,6 @@ static void ixgbe_configure_srrctl(struct ixgbe_adapter *adapter, int index) IXGBE_WRITE_REG(&adapter->hw, IXGBE_SRRCTL(index), srrctl); } -#define PAGE_USE_COUNT(S) (((S) >> PAGE_SHIFT) + \ - (((S) & (PAGE_SIZE - 1)) ? 1 : 0)) - /** * ixgbe_configure_rx - Configure 8259x Receive Unit after Reset * @adapter: board private structure @@ -1574,7 +1571,6 @@ static void ixgbe_configure_rx(struct ixgbe_adapter *adapter) 0xA54F2BEC, 0xEA49AF7C, 0xE214AD3D, 0xB855AABE, 0x6A3E67EA, 0x14364D17, 0x3BED200D}; u32 fctrl, hlreg0; - u32 pages; u32 reta = 0, mrqc; u32 rdrxctl; int rx_buf_len; @@ -1604,8 +1600,6 @@ static void ixgbe_configure_rx(struct ixgbe_adapter *adapter) hlreg0 |= IXGBE_HLREG0_JUMBOEN; IXGBE_WRITE_REG(hw, IXGBE_HLREG0, hlreg0); - pages = PAGE_USE_COUNT(adapter->netdev->mtu); - rdlen = adapter->rx_ring[0].count * sizeof(union ixgbe_adv_rx_desc); /* disable receives while setting up the descriptors */ rxctrl = IXGBE_READ_REG(hw, IXGBE_RXCTRL);