Re: [PATCH net-next 2/5] r8169: add csi_opt

[Francois Romieu]

Hayes Wang <hayeswang@xxxxxxxxxxx> :
> Modify the CSI relative functions by using csi_opt method.

I'll queue the series until Davem opens net-next.

We are supposed to be in a "merge previously queued patches and fix problems"
phase yet.

> diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
> index 3edb996..35b1fea 100644
> --- a/drivers/net/ethernet/realtek/r8169.c
> +++ b/drivers/net/ethernet/realtek/r8169.c
[...]
> -static void rtl_csi_access_enable_2(void __iomem *ioaddr)
> +static void __devinit rtl_init_csi_ops(struct rtl8169_private *tp)
>  {
> -	rtl_csi_access_enable(ioaddr, 0x27000000);
> +	struct csi_ops *ops = &tp->csi_ops;
> +
> +	switch (tp->mac_version) {
> +	default:
> +		ops->write	= r8169_csi_write;
> +		ops->read	= r8169_csi_read;
> +		break;
> +	}
>  }
>  
>  struct ephy_info {
[...]
> @@ -6199,6 +6267,7 @@ rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
>  	rtl_init_mdio_ops(tp);
>  	rtl_init_pll_power_ops(tp);
>  	rtl_init_jumbo_ops(tp);
> +	rtl_init_csi_ops(tp);
>  
>  	rtl8169_print_mac_version(tp);

It will enable the CSI read/write functions where they previously weren't.

Is it really supposed to behave this way ?

Thanks.

-- 
Ueimor
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/