From: Yevgeny Petrilin <yevgenyp@mellanox.co.il>
To: David Miller <davem@davemloft.net>
Cc: netdev@vger.kernel.org, tziporet@mellanox.co.il
Subject: [PATCH 3/5] mlx4_en: Assign dummy event handler for TX queue
Date: Mon, 20 Apr 2009 17:30:03 +0300 [thread overview]
Message-ID: <49EC86EB.1000004@mellanox.co.il> (raw)
In-Reply-To: <49EC859C.700@mellanox.co.il>
The low level driver always assumes this handler exists.
The lack of it could cause kernel panic
Signed-off-by: Yevgeny Petrilin <yevgenyp@mellanox.co.il>
---
drivers/net/mlx4/en_resources.c | 6 ++++++
drivers/net/mlx4/en_rx.c | 6 ------
drivers/net/mlx4/en_tx.c | 1 +
drivers/net/mlx4/mlx4_en.h | 1 +
4 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/drivers/net/mlx4/en_resources.c b/drivers/net/mlx4/en_resources.c
index a054520..65ca706 100644
--- a/drivers/net/mlx4/en_resources.c
+++ b/drivers/net/mlx4/en_resources.c
@@ -94,3 +94,9 @@ void mlx4_en_unmap_buffer(struct mlx4_buf *buf)
vunmap(buf->direct.buf);
}
+
+void mlx4_en_sqp_event(struct mlx4_qp *qp, enum mlx4_event event)
+{
+ return;
+}
+
diff --git a/drivers/net/mlx4/en_rx.c b/drivers/net/mlx4/en_rx.c
index 8673008..0cbb78c 100644
--- a/drivers/net/mlx4/en_rx.c
+++ b/drivers/net/mlx4/en_rx.c
@@ -928,12 +928,6 @@ void mlx4_en_set_default_rss_map(struct mlx4_en_priv *priv,
}
}
-static void mlx4_en_sqp_event(struct mlx4_qp *qp, enum mlx4_event event)
-{
- return;
-}
-
-
static int mlx4_en_config_rss_qp(struct mlx4_en_priv *priv,
int qpn, int srqn, int cqn,
enum mlx4_qp_state *state,
diff --git a/drivers/net/mlx4/en_tx.c b/drivers/net/mlx4/en_tx.c
index 4afd599..ac6fc49 100644
--- a/drivers/net/mlx4/en_tx.c
+++ b/drivers/net/mlx4/en_tx.c
@@ -112,6 +112,7 @@ int mlx4_en_create_tx_ring(struct mlx4_en_priv *priv,
mlx4_err(mdev, "Failed allocating qp %d\n", ring->qpn);
goto err_reserve;
}
+ ring->qp.event = mlx4_en_sqp_event;
return 0;
diff --git a/drivers/net/mlx4/mlx4_en.h b/drivers/net/mlx4/mlx4_en.h
index e9af32d..ef840ab 100644
--- a/drivers/net/mlx4/mlx4_en.h
+++ b/drivers/net/mlx4/mlx4_en.h
@@ -538,6 +538,7 @@ int mlx4_en_poll_rx_cq(struct napi_struct *napi, int budget);
void mlx4_en_fill_qp_context(struct mlx4_en_priv *priv, int size, int stride,
int is_tx, int rss, int qpn, int cqn, int srqn,
struct mlx4_qp_context *context);
+void mlx4_en_sqp_event(struct mlx4_qp *qp, enum mlx4_event event);
int mlx4_en_map_buffer(struct mlx4_buf *buf);
void mlx4_en_unmap_buffer(struct mlx4_buf *buf);
--
1.5.4
next prev parent reply other threads:[~2009-04-20 14:31 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-04-20 14:24 [PATCH 1/5] mlx4_en: Fix error handling while activating RX rings Yevgeny Petrilin
2009-04-20 14:26 ` [PATCH 2/5]mlx4_en: Fix a race at restart task Yevgeny Petrilin
2009-04-21 4:32 ` [PATCH] mlx4_en: Fix cleanup if workqueue create in mlx4_en_add() fails Roland Dreier
2009-04-21 8:50 ` David Miller
2009-04-21 8:49 ` [PATCH 2/5]mlx4_en: Fix a race at restart task David Miller
2009-04-20 14:30 ` Yevgeny Petrilin [this message]
2009-04-21 8:50 ` [PATCH 3/5] mlx4_en: Assign dummy event handler for TX queue David Miller
2009-04-20 14:33 ` [PATCH 4/5] mlx4_en: use NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM for tx csum at initialization Yevgeny Petrilin
2009-04-20 14:34 ` [PATCH 5/5] mlx4_en: Move to SW counters for total bytes and packets Yevgeny Petrilin
2009-04-21 8:50 ` David Miller
2009-04-21 8:50 ` [PATCH 4/5] mlx4_en: use NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM for tx csum at initialization David Miller
2009-04-27 6:42 ` [PATCH 2/2] mlx4_en: Handle page allocation failure during receive Yevgeny Petrilin
2009-04-27 9:31 ` David Miller
2009-04-21 8:49 ` [PATCH 1/5] mlx4_en: Fix error handling while activating RX rings David Miller
2009-04-27 6:41 ` [PATCH 1/2] mlx4_en: Fix cleanup flow on cq activation Yevgeny Petrilin
2009-04-27 9:31 ` David Miller
2009-05-13 11:47 ` [PATCH] mlx4_en: Fix not deleted napi structures Yevgeny Petrilin
2009-05-18 3:49 ` David Miller
2009-05-24 13:16 ` [PATCH 1/2] mlx4_en: Removed redundant stride variable Yevgeny Petrilin
2009-05-25 7:36 ` David Miller
2009-05-24 13:17 ` [PATCH 2/2] mlx4_en: Fix partial rings feature Yevgeny Petrilin
2009-05-25 7:36 ` David Miller
2009-05-25 8:32 ` [net-2.6 PATCH] mlx4_en: Fix a kernel panic when waking tx queue Yevgeny Petrilin
2009-05-25 8:44 ` David Miller
2009-05-26 6:49 ` Yevgeny Petrilin
2009-06-02 9:20 ` [PATCH 2/8] mlx4_en: Moved all module parameters handling to en_main.c Yevgeny Petrilin
2009-06-02 9:21 ` [PATCH 3/8] mlx4_en renamed en_params.c to en_ethtool.c Yevgeny Petrilin
2009-06-02 9:22 ` [PATCH 4/8] mlx4_en: Work with part of the ports Yevgeny Petrilin
2009-06-02 9:23 ` [PATCH 5/8] mlx4_en: Coalescing target is equal for all mtu's Yevgeny Petrilin
2009-06-02 9:24 ` [PATCH 6/8] mlx4_en: multiqueue support Yevgeny Petrilin
2009-06-02 9:28 ` [PATCH 7/8] mlx4_en: Added vlan_features support Yevgeny Petrilin
2009-06-02 9:29 ` [PATCH 8/8] mlx4_en: Updated driver version Yevgeny Petrilin
2009-06-02 9:36 ` David Miller
2009-05-26 6:57 ` [net-2.6 PATCH V2] mlx4_en: Fix a kernel panic when waking tx queue Yevgeny Petrilin
2009-05-26 10:48 ` Eric Dumazet
2009-05-27 6:08 ` Yevgeny Petrilin
2009-05-30 5:00 ` David Miller
2009-06-02 6:27 ` [PATCH 1/8] mlx4_en: Giving interface name in debug messages Yevgeny Petrilin
2009-06-02 7:36 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=49EC86EB.1000004@mellanox.co.il \
--to=yevgenyp@mellanox.co.il \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=tziporet@mellanox.co.il \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.