Commit 7073bb4b authored by Pavel Begunkov's avatar Pavel Begunkov
Browse files

net: memzero mp params when closing a queue 



Instead of resetting memory provider parameters one by one in
__net_mp_{open,close}_rxq, memzero the entire structure. It'll be used
to extend the structure.

Signed-off-by: default avatarPavel Begunkov <asml.silence@gmail.com>
parent 0f61b186

net/core/netdev_rx_queue.c

+4 −6
Original line number Diff line number Diff line
@@ -139,10 +139,9 @@ int __net_mp_open_rxq(struct net_device *dev, unsigned int rxq_idx, 


	rxq->mp_params = *p;

	ret = netdev_rx_queue_restart(dev, rxq_idx);

	if (ret) {

		rxq->mp_params.mp_ops = NULL;

		rxq->mp_params.mp_priv = NULL;

	}

	if (ret)

		memset(&rxq->mp_params, 0, sizeof(rxq->mp_params));



	return ret;

}
@@ -179,8 +178,7 @@ void __net_mp_close_rxq(struct net_device *dev, unsigned int ifq_idx, 
			 rxq->mp_params.mp_priv != old_p->mp_priv))

		return;



	rxq->mp_params.mp_ops = NULL;

	rxq->mp_params.mp_priv = NULL;

	memset(&rxq->mp_params, 0, sizeof(rxq->mp_params));

	err = netdev_rx_queue_restart(dev, ifq_idx);

	WARN_ON(err && err != -ENETDOWN);

}