[PATCH] powerpc/ep8248e: phylib needs NET_SCHED to build
Fix this build error: drivers/built-in.o: In function `phy_state_machine': drivers/net/phy/phy.c:893: undefined reference to 'netif_carrier_off' drivers/net/phy/phy.c:854: undefined reference to 'netif_carrier_on' Signed-off-by: Alexander Beregalov a.berega...@gmail.com --- arch/powerpc/platforms/82xx/Kconfig |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/arch/powerpc/platforms/82xx/Kconfig b/arch/powerpc/platforms/82xx/Kconfig index 7c7df40..36a3e58 100644 --- a/arch/powerpc/platforms/82xx/Kconfig +++ b/arch/powerpc/platforms/82xx/Kconfig @@ -31,6 +31,9 @@ config EP8248E select 8260 select FSL_SOC select PHYLIB + select NET + select NETDEVICE + select NET_SCHED select MDIO_BITBANG help This enables support for the Embedded Planet EP8248E board. -- 1.6.2.4 ___ Linuxppc-dev mailing list Linuxppc-dev@ozlabs.org https://ozlabs.org/mailman/listinfo/linuxppc-dev
Re: [BUILD FAILURE 06/12] Next April 14 : PPC64 randconfig [drivers/net/ehea/ehea_main.c]
On Tue, Apr 14, 2009 at 11:59:07PM +0530, Subrata Modak wrote: Observed the following build error: CC drivers/net/ehea/ehea_main.o drivers/net/ehea/ehea_main.c: In function ???ehea_setup_single_port???: drivers/net/ehea/ehea_main.c:3145: error: ???struct net_device??? has no member named ???tx_timeout??? From 56142fa2ed992aeee3f2635990ac37807379a310 Mon Sep 17 00:00:00 2001 From: Alexander Beregalov a.berega...@gmail.com Date: Tue, 14 Apr 2009 22:35:32 +0400 Subject: [PATCH] ehea: Fix incomplete conversion to net_device_ops Reported-by: Subrata Modak subr...@linux.vnet.ibm.com Signed-off-by: Alexander Beregalov a.berega...@gmail.com --- drivers/net/ehea/ehea_main.c |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ehea/ehea_main.c b/drivers/net/ehea/ehea_main.c index ac0c5b4..604c844 100644 --- a/drivers/net/ehea/ehea_main.c +++ b/drivers/net/ehea/ehea_main.c @@ -3080,7 +3080,8 @@ static const struct net_device_ops ehea_netdev_ops = { .ndo_change_mtu = ehea_change_mtu, .ndo_vlan_rx_register = ehea_vlan_rx_register, .ndo_vlan_rx_add_vid= ehea_vlan_rx_add_vid, - .ndo_vlan_rx_kill_vid = ehea_vlan_rx_kill_vid + .ndo_vlan_rx_kill_vid = ehea_vlan_rx_kill_vid, + .ndo_tx_timeout = ehea_tx_watchdog, }; struct ehea_port *ehea_setup_single_port(struct ehea_adapter *adapter, @@ -3142,7 +3143,6 @@ struct ehea_port *ehea_setup_single_port(struct ehea_adapter *adapter, | NETIF_F_HIGHDMA | NETIF_F_IP_CSUM | NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_FILTER | NETIF_F_LLTX; - dev-tx_timeout = ehea_tx_watchdog; dev-watchdog_timeo = EHEA_WATCH_DOG_TIMEOUT; INIT_WORK(port-reset_task, ehea_reset_port); -- 1.6.2.3 ___ Linuxppc-dev mailing list Linuxppc-dev@ozlabs.org https://ozlabs.org/mailman/listinfo/linuxppc-dev
[PATCH] fs_enet: convert to netdev_ops
Reported-by: Subrata Modak subr...@linux.vnet.ibm.com Signed-off-by: Alexander Beregalov a.berega...@gmail.com --- drivers/net/fs_enet/fs_enet-main.c | 27 +-- 1 files changed, 17 insertions(+), 10 deletions(-) diff --git a/drivers/net/fs_enet/fs_enet-main.c b/drivers/net/fs_enet/fs_enet-main.c index b037ce9..a9cbc31 100644 --- a/drivers/net/fs_enet/fs_enet-main.c +++ b/drivers/net/fs_enet/fs_enet-main.c @@ -1019,6 +1019,22 @@ out_put_phy: #define IS_FEC(match) 0 #endif +static const struct net_device_ops fs_enet_netdev_ops = { + .ndo_open = fs_enet_open, + .ndo_stop = fs_enet_close, + .ndo_get_stats = fs_enet_get_stats, + .ndo_start_xmit = fs_enet_start_xmit, + .ndo_tx_timeout = fs_timeout, + .ndo_set_multicast_list = fs_set_multicast_list, + .ndo_do_ioctl = fs_ioctl, + .ndo_validate_addr = eth_validate_addr, + .ndo_set_mac_address= eth_mac_addr, + .ndo_change_mtu = eth_change_mtu, +#ifdef CONFIG_NET_POLL_CONTROLLER + .ndo_poll_controller= fs_enet_netpoll, +#endif +}; + static int __devinit fs_enet_probe(struct of_device *ofdev, const struct of_device_id *match) { @@ -1093,22 +1109,13 @@ static int __devinit fs_enet_probe(struct of_device *ofdev, fep-tx_ring = fpi-tx_ring; fep-rx_ring = fpi-rx_ring; - ndev-open = fs_enet_open; - ndev-hard_start_xmit = fs_enet_start_xmit; - ndev-tx_timeout = fs_timeout; + ndev-netdev_ops = fs_enet_netdev_ops; ndev-watchdog_timeo = 2 * HZ; - ndev-stop = fs_enet_close; - ndev-get_stats = fs_enet_get_stats; - ndev-set_multicast_list = fs_set_multicast_list; -#ifdef CONFIG_NET_POLL_CONTROLLER - ndev-poll_controller = fs_enet_netpoll; -#endif if (fpi-use_napi) netif_napi_add(ndev, fep-napi, fs_enet_rx_napi, fpi-napi_weight); ndev-ethtool_ops = fs_ethtool_ops; - ndev-do_ioctl = fs_ioctl; init_timer(fep-phy_timer_list); ___ Linuxppc-dev mailing list Linuxppc-dev@ozlabs.org https://ozlabs.org/mailman/listinfo/linuxppc-dev
Re: converting fs_enet to net_device_ops
2009/4/9 Kumar Gala ga...@kernel.crashing.org: Can someone look at converting drivers/net/fs_enet over to the new net_device_ops. Dave, Are you willing to take such a patch in for .30? Otherwise we need to add a select COMPAT_NET_DEV_OPS in Kconfig for this driver (and any others that might not have been converted over). drivers/net/ibm_newemac/ is another. Hi I did not this mail. I have sent a patch for it. http://patchwork.ozlabs.org/patch/25781/ ___ Linuxppc-dev mailing list Linuxppc-dev@ozlabs.org https://ozlabs.org/mailman/listinfo/linuxppc-dev
Re: [BUILD FAILURE 04] Next April 9 : PPC64 randconfig [drivers/net/ibm_newemac/core.c]
On Thu, Apr 09, 2009 at 10:31:12AM -0400, Josh Boyer wrote: On Thu, Apr 09, 2009 at 09:28:23AM -0500, Kumar Gala wrote: On Apr 9, 2009, at 8:52 AM, Subrata Modak wrote: Observed the following build error: CC drivers/net/ibm_newemac/core.o drivers/net/ibm_newemac/core.c: In function ???emac_probe???: drivers/net/ibm_newemac/core.c:2831: error: ???struct net_device??? has no member named ???open??? drivers/net/ibm_newemac/core.c:2834: error: ???struct net_device??? has no member named ???tx_timeout??? drivers/net/ibm_newemac/core.c:2836: error: ???struct net_device??? has no member named ???stop??? drivers/net/ibm_newemac/core.c:2837: error: ???struct net_device??? has no member named ???get_stats??? drivers/net/ibm_newemac/core.c:2838: error: ???struct net_device??? has no member named ???set_multicast_list??? drivers/net/ibm_newemac/core.c:2839: error: ???struct net_device??? has no member named ???do_ioctl??? drivers/net/ibm_newemac/core.c:2841: error: ???struct net_device??? has no member named ???hard_start_xmit??? drivers/net/ibm_newemac/core.c:2842: error: ???struct net_device??? has no member named ???change_mtu??? drivers/net/ibm_newemac/core.c:2845: error: ???struct net_device??? has no member named ???hard_start_xmit??? make[3]: *** [drivers/net/ibm_newemac/core.o] Error 1 make[2]: *** [drivers/net/ibm_newemac] Error 2 make[1]: *** [drivers/net] Error 2 make: *** [drivers] Error 2 Regards-- Subrata randconfig4-ppc64-next20090409.txt This is because CONFIG_COMPAT_NET_DEV_OPS isnt set and needs to be for this driver to build. I've asked the netdev guys about either fixing the driver or adding the proper thing to Kconfig to select CONFIG_COMPAT_NET_DEV_OPS. Thanks! If someone has pointers on what needs to be done to fix it, let me know. From: Alexander Beregalov a.berega...@gmail.com Subject: [PATCH] ibm_newemac: convert to netdev_ops Reported-by: Subrata Modak subr...@linux.vnet.ibm.com Signed-off-by: Alexander Beregalov a.berega...@gmail.com --- drivers/net/ibm_newemac/core.c | 41 --- 1 files changed, 29 insertions(+), 12 deletions(-) diff --git a/drivers/net/ibm_newemac/core.c b/drivers/net/ibm_newemac/core.c index 77e4b5b..806533c 100644 --- a/drivers/net/ibm_newemac/core.c +++ b/drivers/net/ibm_newemac/core.c @@ -2686,6 +2686,32 @@ static int __devinit emac_init_config(struct emac_instance *dev) return 0; } +static const struct net_device_ops emac_netdev_ops = { + .ndo_open = emac_open, + .ndo_stop = emac_close, + .ndo_get_stats = emac_stats, + .ndo_set_multicast_list = emac_set_multicast_list, + .ndo_do_ioctl = emac_ioctl, + .ndo_tx_timeout = emac_tx_timeout, + .ndo_validate_addr = eth_validate_addr, + .ndo_set_mac_address= eth_mac_addr, + .ndo_start_xmit = emac_start_xmit, + .ndo_change_mtu = eth_change_mtu, +}; + +static const struct net_device_ops emac_gige_netdev_ops = { + .ndo_open = emac_open, + .ndo_stop = emac_close, + .ndo_get_stats = emac_stats, + .ndo_set_multicast_list = emac_set_multicast_list, + .ndo_do_ioctl = emac_ioctl, + .ndo_tx_timeout = emac_tx_timeout, + .ndo_validate_addr = eth_validate_addr, + .ndo_set_mac_address= eth_mac_addr, + .ndo_start_xmit = emac_start_xmit_sg, + .ndo_change_mtu = emac_change_mtu, +}; + static int __devinit emac_probe(struct of_device *ofdev, const struct of_device_id *match) { @@ -2827,23 +2853,14 @@ static int __devinit emac_probe(struct of_device *ofdev, if (err != 0) goto err_detach_tah; - /* Fill in the driver function table */ - ndev-open = emac_open; if (dev-tah_dev) ndev-features |= NETIF_F_IP_CSUM | NETIF_F_SG; - ndev-tx_timeout = emac_tx_timeout; ndev-watchdog_timeo = 5 * HZ; - ndev-stop = emac_close; - ndev-get_stats = emac_stats; - ndev-set_multicast_list = emac_set_multicast_list; - ndev-do_ioctl = emac_ioctl; if (emac_phy_supports_gige(dev-phy_mode)) { - ndev-hard_start_xmit = emac_start_xmit_sg; - ndev-change_mtu = emac_change_mtu; + ndev-netdev_ops = emac_gige_netdev_ops; dev-commac.ops = emac_commac_sg_ops; - } else { - ndev-hard_start_xmit = emac_start_xmit; - } + } else + ndev-netdev_ops = emac_netdev_ops; SET_ETHTOOL_OPS(ndev, emac_ethtool_ops); netif_carrier_off(ndev); ___ Linuxppc-dev mailing list Linuxppc-dev@ozlabs.org https://ozlabs.org/mailman/listinfo/linuxppc-dev
[PATCH next] powerpc/5200: fix building GPT driver without sysfs
arch/powerpc/platforms/52xx/mpc52xx_gpt.c: In function 'mpc52xx_gpt_create_attribs': arch/powerpc/platforms/52xx/mpc52xx_gpt.c:373: error: parameter name omitted arch/powerpc/platforms/52xx/mpc52xx_gpt.c:373: warning: 'return' with a value, in function returning void Signed-off-by: Alexander Beregalov a.berega...@gmail.com --- arch/powerpc/platforms/52xx/mpc52xx_gpt.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/powerpc/platforms/52xx/mpc52xx_gpt.c b/arch/powerpc/platforms/52xx/mpc52xx_gpt.c index cb038dc..ef81cce 100644 --- a/arch/powerpc/platforms/52xx/mpc52xx_gpt.c +++ b/arch/powerpc/platforms/52xx/mpc52xx_gpt.c @@ -370,7 +370,7 @@ static void mpc52xx_gpt_create_attribs(struct mpc52xx_gpt_priv *gpt) } #else /* defined(CONFIG_SYSFS) */ -static void mpc52xx_gpt_create_attribs(struct mpc52xx_gpt_priv *) { return 0; } +static inline void mpc52xx_gpt_create_attribs(struct mpc52xx_gpt_priv *gpt) {} #endif /* defined(CONFIG_SYSFS) */ /* - ___ Linuxppc-dev mailing list Linuxppc-dev@ozlabs.org https://ozlabs.org/mailman/listinfo/linuxppc-dev