[PATCH net-next 0/2] qlge: Fix compilation warning and update maintainers

[PATCH net-next 0/2] qlge: Fix compilation warning and update maintainers

[Harish Patil]

From: Harish Patil <harish.patil@qlogic.com>

This patch series includes the following set of patches:

- Fix the below warning message observed during qlge compilation:
  qlge_main.c:1754: warning: 'lbq_desc' may be used uninitialized in this function

- Update qlge driver maintainers list

Please apply this series to net-next.

Thanks,
Harish

Harish Patil (1):
   qlge: Fix compilation warning
   Update qlge driver maintainers list

MAINTAINERS                                  | 4 ++--
drivers/net/ethernet/qlogic/qlge/qlge_main.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)

[PATCH net-next 1/2] qlge: Fix compilation warning

[Harish Patil]

From: Harish Patil <harish.patil@qlogic.com>

Fix the below warning message observed during qlge compilation:
qlge_main.c:1754: warning: 'lbq_desc' may be used uninitialized in this function

Signed-off-by: Harish Patil <harish.patil@qlogic.com>
---
 drivers/net/ethernet/qlogic/qlge/qlge_main.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/qlogic/qlge/qlge_main.c b/drivers/net/ethernet/qlogic/qlge/qlge_main.c
index b40050e..767bcc5 100644
--- a/drivers/net/ethernet/qlogic/qlge/qlge_main.c
+++ b/drivers/net/ethernet/qlogic/qlge/qlge_main.c
@@ -1750,9 +1750,9 @@ static struct sk_buff *ql_build_rx_skb(struct ql_adapter *qdev,
 				       struct rx_ring *rx_ring,
 				       struct ib_mac_iocb_rsp *ib_mac_rsp)
 {
-	struct bq_desc *lbq_desc;
-	struct bq_desc *sbq_desc;
+	struct bq_desc *lbq_desc = NULL;
 	struct sk_buff *skb = NULL;
+	struct bq_desc *sbq_desc;
 	u32 length = le32_to_cpu(ib_mac_rsp->data_len);
 	u32 hdr_len = le32_to_cpu(ib_mac_rsp->hdr_len);
 	size_t hlen = ETH_HLEN;
-- 
1.8.1.4

[PATCH net-next 2/2] Update qlge driver maintainers list

[Harish Patil]

From: Harish Patil <harish.patil@qlogic.com>

Signed-off-by: Harish Patil <harish.patil@qlogic.com>
---
 MAINTAINERS | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index f00d2c5..4ef9c5f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7294,8 +7294,8 @@ S:	Supported
 F:	drivers/net/ethernet/qlogic/qlcnic/
 
 QLOGIC QLGE 10Gb ETHERNET DRIVER
-M:	Shahed Shaikh <shahed.shaikh@qlogic.com>
-M:	Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>
+M:	Harish Patil <harish.patil@qlogic.com>
+M: 	Sudarsana Kalluru <sudarsana.kalluru@qlogic.com>
 M:	Ron Mercer <ron.mercer@qlogic.com>
 M:	linux-driver@qlogic.com
 L:	netdev@vger.kernel.org
-- 
1.8.1.4

Re: [PATCH net-next 1/2] qlge: Fix compilation warning

[David Miller]

From: Harish Patil <harish.patil@qlogic.com>
Date: Wed, 13 Aug 2014 14:08:08 -0400

> From: Harish Patil <harish.patil@qlogic.com>
> 
> Fix the below warning message observed during qlge compilation:
> qlge_main.c:1754: warning: 'lbq_desc' may be used uninitialized in this function
> 
> Signed-off-by: Harish Patil <harish.patil@qlogic.com>

Please fix this differently.  The problem is that the compiler can't see that
you've done the !length check at the top of the function, so when it later
sees the while (length > 0) loop, it doesn't know that this loop will always
execute at least once.

Just change that loop to a do { } while() loop and the compiler will be able
to see everything.

Re: [PATCH net-next 1/2] qlge: Fix compilation warning

[David Miller]

From: Harish Patil <harish.patil@qlogic.com>
Date: Thu, 18 Sep 2014 17:27:24 -0400

> From: Harish Patil <harish.patil@qlogic.com>
> 
> Signed-off-by: Harish Patil <harish.patil@qlogic.com>
> 
> Fix the below warning message:
> qlge_main.c:1754: warning: 'lbq_desc' may be used uninitialized in this function

Next time, put the build warning information before, not after, your signoff.

[PATCH net-next 1/2] qlge: Fix compilation warning

[Harish Patil]

From: Harish Patil <harish.patil@qlogic.com>

Signed-off-by: Harish Patil <harish.patil@qlogic.com>

Fix the below warning message:
qlge_main.c:1754: warning: 'lbq_desc' may be used uninitialized in this function
---
 drivers/net/ethernet/qlogic/qlge/qlge_main.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/qlogic/qlge/qlge_main.c b/drivers/net/ethernet/qlogic/qlge/qlge_main.c
index 3e96f26..6c904a6 100644
--- a/drivers/net/ethernet/qlogic/qlge/qlge_main.c
+++ b/drivers/net/ethernet/qlogic/qlge/qlge_main.c
@@ -1922,7 +1922,7 @@ static struct sk_buff *ql_build_rx_skb(struct ql_adapter *qdev,
 			sbq_desc->p.skb = NULL;
 			skb_reserve(skb, NET_IP_ALIGN);
 		}
-		while (length > 0) {
+		do {
 			lbq_desc = ql_get_curr_lchunk(qdev, rx_ring);
 			size = (length < rx_ring->lbq_buf_size) ? length :
 				rx_ring->lbq_buf_size;
@@ -1939,7 +1939,7 @@ static struct sk_buff *ql_build_rx_skb(struct ql_adapter *qdev,
 			skb->truesize += size;
 			length -= size;
 			i++;
-		}
+		} while (length > 0);
 		ql_update_mac_hdr_len(qdev, ib_mac_rsp, lbq_desc->p.pg_chunk.va,
 				      &hlen);
 		__pskb_pull_tail(skb, hlen);
-- 
1.8.1.4