Skip to content

Commit

Permalink
Revert "be2net: remove desc field from be_eq_obj"
Browse files Browse the repository at this point in the history
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: d6d9704 ("be2net: remove desc field from be_eq_obj")
Signed-off-by: Ivan Vecera <ivecera@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Ivan Vecera authored and David S. Miller committed Oct 23, 2018
1 parent 89ab066 commit 5ef7915
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
1 change: 1 addition & 0 deletions drivers/net/ethernet/emulex/benet/be.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 2 additions & 4 deletions drivers/net/ethernet/emulex/benet/be_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit 5ef7915

Please sign in to comment.