Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7ce2e02c authored by Ivan Vecera's avatar Ivan Vecera Committed by Greg Kroah-Hartman
Browse files

Revert "be2net: remove desc field from be_eq_obj" 



[ Upstream commit 5ef79151c2fbc401cf38325e9a32e77b9fc593ae ]

The mentioned commit needs to be reverted because we cannot pass
string allocated on stack to request_irq(). This function stores
uses this pointer for later use (e.g. /proc/interrupts) so we need
to keep this string persistently.

Fixes: d6d9704a ("be2net: remove desc field from be_eq_obj")
Signed-off-by: default avatarIvan Vecera <ivecera@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4778b9f0

drivers/net/ethernet/emulex/benet/be.h

+1 −0
Original line number Diff line number Diff line
@@ -185,6 +185,7 @@ static inline void queue_tail_inc(struct be_queue_info *q) 


struct be_eq_obj {

	struct be_queue_info q;

	char desc[32];



	struct be_adapter *adapter;

	struct napi_struct napi;

drivers/net/ethernet/emulex/benet/be_main.c

+2 −4
Original line number Diff line number Diff line
@@ -3488,11 +3488,9 @@ static int be_msix_register(struct be_adapter *adapter) 
	int status, i, vec;



	for_all_evt_queues(adapter, eqo, i) {

		char irq_name[IFNAMSIZ+4];



		snprintf(irq_name, sizeof(irq_name), "%s-q%d", netdev->name, i);

		sprintf(eqo->desc, "%s-q%d", netdev->name, i);

		vec = be_msix_vec_get(adapter, eqo);

		status = request_irq(vec, be_msix, 0, irq_name, eqo);

		status = request_irq(vec, be_msix, 0, eqo->desc, eqo);

		if (status)

			goto err_msix;