diff mbox

[rdma-next,4/6] IB/IPoIB: Rename qpn to be dqpn in ipoib_send and post_send functions

Message ID 20170404191732.31895-5-leon@kernel.org (mailing list archive)
State Superseded
Headers show

Commit Message

Leon Romanovsky April 4, 2017, 7:17 p.m. UTC 
From: Erez Shitrit <erezsh@mellanox.com>

Change of function parameter name from qpn to be dqpn.

Signed-off-by: Erez Shitrit <erezsh@mellanox.com>
Signed-off-by: Leon Romanovsky <leon@kernel.org>
---
 drivers/infiniband/ulp/ipoib/ipoib.h    | 2 +-
 drivers/infiniband/ulp/ipoib/ipoib_ib.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

Comments

kernel test robot April 5, 2017, 12:56 a.m. UTC | #1 
Hi Erez,

[auto build test ERROR on rdma/master]
[also build test ERROR on v4.11-rc5 next-20170404]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]

url:    https://github.com/0day-ci/linux/commits/Leon-Romanovsky/Enhanced-mode-for-IPoIB-driver/20170405-063335
base:   https://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma.git master
config: i386-allmodconfig (attached as .config)
compiler: gcc-6 (Debian 6.2.0-3) 6.2.0 20160901
reproduce:
        # save the attached .config to linux build tree
        make ARCH=i386 

All errors (new ones prefixed by >>):

   In file included from drivers/infiniband/ulp/ipoib/ipoib_ib.c:44:0:
   drivers/infiniband/ulp/ipoib/ipoib_ib.c: In function 'ipoib_send':
>> drivers/infiniband/ulp/ipoib/ipoib_ib.c:590:29: error: 'qpn' undeclared (first use in this function)
             skb->len, address, qpn);
                                ^
   drivers/infiniband/ulp/ipoib/ipoib.h:780:79: note: in definition of macro 'ipoib_printk'
     printk(level "%s: " format, ((struct ipoib_dev_priv *) priv)->dev->name , ## arg)
                                                                                  ^~~
   drivers/infiniband/ulp/ipoib/ipoib_ib.c:589:2: note: in expansion of macro 'ipoib_dbg_data'
     ipoib_dbg_data(priv, "sending packet, length=%d address=%p qpn=0x%06x\n",
     ^~~~~~~~~~~~~~
   drivers/infiniband/ulp/ipoib/ipoib_ib.c:590:29: note: each undeclared identifier is reported only once for each function it appears in
             skb->len, address, qpn);
                                ^
   drivers/infiniband/ulp/ipoib/ipoib.h:780:79: note: in definition of macro 'ipoib_printk'
     printk(level "%s: " format, ((struct ipoib_dev_priv *) priv)->dev->name , ## arg)
                                                                                  ^~~
   drivers/infiniband/ulp/ipoib/ipoib_ib.c:589:2: note: in expansion of macro 'ipoib_dbg_data'
     ipoib_dbg_data(priv, "sending packet, length=%d address=%p qpn=0x%06x\n",
     ^~~~~~~~~~~~~~

vim +/qpn +590 drivers/infiniband/ulp/ipoib/ipoib_ib.c

78a50a5e Hans Westgaard Ry 2016-03-02  584  			dev_kfree_skb_any(skb);
78a50a5e Hans Westgaard Ry 2016-03-02  585  			return;
78a50a5e Hans Westgaard Ry 2016-03-02  586  		}
78a50a5e Hans Westgaard Ry 2016-03-02  587  	}
^1da177e Linus Torvalds    2005-04-16  588  
^1da177e Linus Torvalds    2005-04-16  589  	ipoib_dbg_data(priv, "sending packet, length=%d address=%p qpn=0x%06x\n",
^1da177e Linus Torvalds    2005-04-16 @590  		       skb->len, address, qpn);
^1da177e Linus Torvalds    2005-04-16  591  
^1da177e Linus Torvalds    2005-04-16  592  	/*
^1da177e Linus Torvalds    2005-04-16  593  	 * We put the skb into the tx_ring _before_ we call post_send()

:::::: The code at line 590 was first introduced by commit
:::::: 1da177e4c3f41524e886b7f1b8a0c1fc7321cac2 Linux-2.6.12-rc2

:::::: TO: Linus Torvalds <torvalds@ppc970.osdl.org>
:::::: CC: Linus Torvalds <torvalds@ppc970.osdl.org>

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation
Leon Romanovsky April 5, 2017, 10:38 a.m. UTC | #2 
On Wed, Apr 05, 2017 at 08:56:29AM +0800, kbuild test robot wrote:
> Hi Erez,
>
> [auto build test ERROR on rdma/master]
> [also build test ERROR on v4.11-rc5 next-20170404]
> [if your patch is applied to the wrong git tree, please drop us a note to help improve the system]

It should be applied to v4.11-rc3 and not to -rc5.

Thanks
Bart Van Assche April 5, 2017, 3 p.m. UTC | #3 
On Wed, 2017-04-05 at 13:38 +0300, Leon Romanovsky wrote:
> On Wed, Apr 05, 2017 at 08:56:29AM +0800, kbuild test robot wrote:
> > Hi Erez,
> > 
> > [auto build test ERROR on rdma/master]
> > [also build test ERROR on v4.11-rc5 next-20170404]
> > [if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
> 
> It should be applied to v4.11-rc3 and not to -rc5.

Hello Leon,

Will it be possible for Doug to apply this series to his tree without
rebasing this patch series on rc5 instead of rc3?

Thanks,

Bart.--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Leon Romanovsky April 5, 2017, 4:35 p.m. UTC | #4 
On Wed, Apr 05, 2017 at 03:00:48PM +0000, Bart Van Assche wrote:
> On Wed, 2017-04-05 at 13:38 +0300, Leon Romanovsky wrote:
> > On Wed, Apr 05, 2017 at 08:56:29AM +0800, kbuild test robot wrote:
> > > Hi Erez,
> > >
> > > [auto build test ERROR on rdma/master]
> > > [also build test ERROR on v4.11-rc5 next-20170404]
> > > [if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
> >
> > It should be applied to v4.11-rc3 and not to -rc5.
>
> Hello Leon,
>
> Will it be possible for Doug to apply this series to his tree without
> rebasing this patch series on rc5 instead of rc3?

Yes, I tried it now and it worked in both directions without conflicts.
I merged these patches into rc5 and rc5 into them.

However, I asked from Doug explicitly during the OFA on which rc should
I base my submissions and he asked to submit based on rc3, so I did.

Thanks

>
> Thanks,
>
> Bart.
diff mbox

Patch

diff --git a/drivers/infiniband/ulp/ipoib/ipoib.h b/drivers/infiniband/ulp/ipoib/ipoib.h
index b3900b253ad5..d94a7a953338 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib.h
+++ b/drivers/infiniband/ulp/ipoib/ipoib.h
@@ -483,7 +483,7 @@  int ipoib_add_pkey_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,
-		struct ipoib_ah *address, u32 qpn);
+		struct ipoib_ah *address, u32 dqpn);
 void ipoib_reap_ah(struct work_struct *work);
 
 struct ipoib_path *__path_find(struct net_device *dev, void *gid);
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_ib.c b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
index 5eaa4e6cebcd..688688c21ef7 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_ib.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
@@ -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,
 			    unsigned int wr_id,
-			    struct ib_ah *address, u32 qpn,
+			    struct ib_ah *address, u32 dqpn,
 			    struct ipoib_tx_buf *tx_req,
 			    void *head, int hlen)
 {
@@ -523,7 +523,7 @@  static inline int post_send(struct ipoib_dev_priv *priv,
 	ipoib_build_sge(priv, tx_req);
 
 	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;
 
 	if (head) {
@@ -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,
-		struct ipoib_ah *address, u32 qpn)
+		struct ipoib_ah *address, u32 dqpn)
 {
 	struct ipoib_dev_priv *priv = netdev_priv(dev);
 	struct ipoib_tx_buf *tx_req;
@@ -620,7 +620,7 @@  void ipoib_send(struct net_device *dev, struct sk_buff *skb,
 	skb_dst_drop(skb);
 
 	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)) {
 		ipoib_warn(priv, "post_send failed, error %d\n", rc);
 		++dev->stats.tx_errors;