Commit 10adcbd2 authored by Erez Shitrit's avatar Erez Shitrit Committed by Doug Ledford

IB/IPoIB: Rename qpn to be dqpn in ipoib_send and post_send functions

Change of function parameter name from qpn to be dqpn.
Signed-off-by: default avatarErez Shitrit <erezsh@mellanox.com>
Reviewed-by: default avatarAlex Vesker <valex@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 7ce1a3ee
...@@ -483,7 +483,7 @@ int ipoib_add_pkey_attr(struct net_device *dev); ...@@ -483,7 +483,7 @@ int ipoib_add_pkey_attr(struct net_device *dev);
int ipoib_add_umcast_attr(struct net_device *dev); int ipoib_add_umcast_attr(struct net_device *dev);
void ipoib_send(struct net_device *dev, struct sk_buff *skb, void ipoib_send(struct net_device *dev, struct sk_buff *skb,
struct ipoib_ah *address, u32 qpn); struct ipoib_ah *address, u32 dqpn);
void ipoib_reap_ah(struct work_struct *work); void ipoib_reap_ah(struct work_struct *work);
struct ipoib_path *__path_find(struct net_device *dev, void *gid); struct ipoib_path *__path_find(struct net_device *dev, void *gid);
......
...@@ -513,7 +513,7 @@ void ipoib_send_comp_handler(struct ib_cq *cq, void *dev_ptr) ...@@ -513,7 +513,7 @@ void ipoib_send_comp_handler(struct ib_cq *cq, void *dev_ptr)
static inline int post_send(struct ipoib_dev_priv *priv, static inline int post_send(struct ipoib_dev_priv *priv,
unsigned int wr_id, unsigned int wr_id,
struct ib_ah *address, u32 qpn, struct ib_ah *address, u32 dqpn,
struct ipoib_tx_buf *tx_req, struct ipoib_tx_buf *tx_req,
void *head, int hlen) void *head, int hlen)
{ {
...@@ -523,7 +523,7 @@ static inline int post_send(struct ipoib_dev_priv *priv, ...@@ -523,7 +523,7 @@ static inline int post_send(struct ipoib_dev_priv *priv,
ipoib_build_sge(priv, tx_req); ipoib_build_sge(priv, tx_req);
priv->tx_wr.wr.wr_id = wr_id; priv->tx_wr.wr.wr_id = wr_id;
priv->tx_wr.remote_qpn = qpn; priv->tx_wr.remote_qpn = dqpn;
priv->tx_wr.ah = address; priv->tx_wr.ah = address;
if (head) { if (head) {
...@@ -538,7 +538,7 @@ static inline int post_send(struct ipoib_dev_priv *priv, ...@@ -538,7 +538,7 @@ static inline int post_send(struct ipoib_dev_priv *priv,
} }
void ipoib_send(struct net_device *dev, struct sk_buff *skb, void ipoib_send(struct net_device *dev, struct sk_buff *skb,
struct ipoib_ah *address, u32 qpn) struct ipoib_ah *address, u32 dqpn)
{ {
struct ipoib_dev_priv *priv = netdev_priv(dev); struct ipoib_dev_priv *priv = netdev_priv(dev);
struct ipoib_tx_buf *tx_req; struct ipoib_tx_buf *tx_req;
...@@ -586,8 +586,9 @@ void ipoib_send(struct net_device *dev, struct sk_buff *skb, ...@@ -586,8 +586,9 @@ void ipoib_send(struct net_device *dev, struct sk_buff *skb,
} }
} }
ipoib_dbg_data(priv, "sending packet, length=%d address=%p qpn=0x%06x\n", ipoib_dbg_data(priv,
skb->len, address, qpn); "sending packet, length=%d address=%p dqpn=0x%06x\n",
skb->len, address, dqpn);
/* /*
* We put the skb into the tx_ring _before_ we call post_send() * We put the skb into the tx_ring _before_ we call post_send()
...@@ -620,7 +621,7 @@ void ipoib_send(struct net_device *dev, struct sk_buff *skb, ...@@ -620,7 +621,7 @@ void ipoib_send(struct net_device *dev, struct sk_buff *skb,
skb_dst_drop(skb); skb_dst_drop(skb);
rc = post_send(priv, priv->tx_head & (ipoib_sendq_size - 1), rc = post_send(priv, priv->tx_head & (ipoib_sendq_size - 1),
address->ah, qpn, tx_req, phead, hlen); address->ah, dqpn, tx_req, phead, hlen);
if (unlikely(rc)) { if (unlikely(rc)) {
ipoib_warn(priv, "post_send failed, error %d\n", rc); ipoib_warn(priv, "post_send failed, error %d\n", rc);
++dev->stats.tx_errors; ++dev->stats.tx_errors;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment