On Sat, Mar 21, 2015 at 04:08:00PM +0900, Hyong-Youb Kim wrote:
> On Fri, Mar 20, 2015 at 04:18:11PM -0700, Luis R. Rodriguez wrote:
> > From: "Luis R. Rodriguez" <mcgrof@xxxxxxxx>
> >
> > This driver already uses ioremap_wc() on the same range
> > so when write-combining is available that will be used
> > instead.
> >
> [...]
> > --- a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c
> > +++ b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c
> [...]
> > @@ -1984,7 +1979,6 @@ myri10ge_get_ethtool_stats(struct net_device *netdev,
> > data[i] = ((u64 *)&link_stats)[i];
> >
> > data[i++] = (unsigned int)mgp->tx_boundary;
> > - data[i++] = (unsigned int)mgp->wc_enabled;
> > data[i++] = (unsigned int)mgp->pdev->irq;
> > data[i++] = (unsigned int)mgp->msi_enabled;
> > data[i++] = (unsigned int)mgp->msix_enabled;
>
> You would have to delete "WC from myri10ge_gstrings_main_stats too.
> Something like below. Thanks.
>
> @@ -1905,7 +1905,7 @@ static const char myri10ge_gstrings_main_stats[][ETH_GSTRING_LEN] = {
> "tx_aborted_errors", "tx_carrier_errors", "tx_fifo_errors",
> "tx_heartbeat_errors", "tx_window_errors",
> /* device-specific stats */
> - "tx_boundary", "WC", "irq", "MSI", "MSIX",
> + "tx_boundary", "irq", "MSI", "MSIX",
> "read_dma_bw_MBs", "write_dma_bw_MBs", "read_write_dma_bw_MBs",
> "serial_number", "watchdog_resets",
> #ifdef CONFIG_MYRI10GE_DCA
OK great thanks. Amended.
Luis
--
To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
