Unverified Commit 564dca06 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!9569 net: fec: remove .ndo_poll_controller to avoid deadlocks 

Merge Pull Request from: @ci-robot 
 
PR sync from: Li Zetao <lizetao1@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/OT4W6L6BJS2CBXJYLAO54QDXGTGPDHVO/ 
 
https://gitee.com/src-openeuler/kernel/issues/IA6SB0 
 
Link:https://gitee.com/openeuler/kernel/pulls/9569

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Reviewed-by: default avatarZhang Jianhua <chris.zjh@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents d0bc225c d1daae73

drivers/net/ethernet/freescale/fec_main.c

+0 −26
Original line number Diff line number Diff line
@@ -3208,29 +3208,6 @@ fec_set_mac_address(struct net_device *ndev, void *p) 
	return 0;

}



#ifdef CONFIG_NET_POLL_CONTROLLER

/**

 * fec_poll_controller - FEC Poll controller function

 * @dev: The FEC network adapter

 *

 * Polled functionality used by netconsole and others in non interrupt mode

 *

 */

static void fec_poll_controller(struct net_device *dev)

{

	int i;

	struct fec_enet_private *fep = netdev_priv(dev);



	for (i = 0; i < FEC_IRQ_NUM; i++) {

		if (fep->irq[i] > 0) {

			disable_irq(fep->irq[i]);

			fec_enet_interrupt(fep->irq[i], dev);

			enable_irq(fep->irq[i]);

		}

	}

}

#endif



static inline void fec_enet_set_netdev_features(struct net_device *netdev,

	netdev_features_t features)

{
@@ -3304,9 +3281,6 @@ static const struct net_device_ops fec_netdev_ops = { 
	.ndo_tx_timeout		= fec_timeout,

	.ndo_set_mac_address	= fec_set_mac_address,

	.ndo_do_ioctl		= fec_enet_ioctl,

#ifdef CONFIG_NET_POLL_CONTROLLER

	.ndo_poll_controller	= fec_poll_controller,

#endif

	.ndo_set_features	= fec_set_features,

};