Commit 34f6b874 authored by David S. Miller's avatar David S. Miller

Merge branch 'qlge'

Harish Patil says:

====================
qlge: Fix compilation warning and update maintainers

This patch series includes the following set of patches:

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

I have made changes according to your earlier feedback:

"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."

- Update qlge driver maintainers list
====================
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 5f5316fc c9b1a5b5
...@@ -7385,9 +7385,9 @@ S: Supported ...@@ -7385,9 +7385,9 @@ S: Supported
F: drivers/net/ethernet/qlogic/qlcnic/ F: drivers/net/ethernet/qlogic/qlcnic/
QLOGIC QLGE 10Gb ETHERNET DRIVER QLOGIC QLGE 10Gb ETHERNET DRIVER
M: Shahed Shaikh <shahed.shaikh@qlogic.com> M: Harish Patil <harish.patil@qlogic.com>
M: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com> M: Sudarsana Kalluru <sudarsana.kalluru@qlogic.com>
M: Ron Mercer <ron.mercer@qlogic.com> M: Dept-GELinuxNICDev@qlogic.com
M: linux-driver@qlogic.com M: linux-driver@qlogic.com
L: netdev@vger.kernel.org L: netdev@vger.kernel.org
S: Supported S: Supported
......
...@@ -1922,7 +1922,7 @@ static struct sk_buff *ql_build_rx_skb(struct ql_adapter *qdev, ...@@ -1922,7 +1922,7 @@ static struct sk_buff *ql_build_rx_skb(struct ql_adapter *qdev,
sbq_desc->p.skb = NULL; sbq_desc->p.skb = NULL;
skb_reserve(skb, NET_IP_ALIGN); skb_reserve(skb, NET_IP_ALIGN);
} }
while (length > 0) { do {
lbq_desc = ql_get_curr_lchunk(qdev, rx_ring); lbq_desc = ql_get_curr_lchunk(qdev, rx_ring);
size = (length < rx_ring->lbq_buf_size) ? length : size = (length < rx_ring->lbq_buf_size) ? length :
rx_ring->lbq_buf_size; rx_ring->lbq_buf_size;
...@@ -1939,7 +1939,7 @@ static struct sk_buff *ql_build_rx_skb(struct ql_adapter *qdev, ...@@ -1939,7 +1939,7 @@ static struct sk_buff *ql_build_rx_skb(struct ql_adapter *qdev,
skb->truesize += size; skb->truesize += size;
length -= size; length -= size;
i++; i++;
} } while (length > 0);
ql_update_mac_hdr_len(qdev, ib_mac_rsp, lbq_desc->p.pg_chunk.va, ql_update_mac_hdr_len(qdev, ib_mac_rsp, lbq_desc->p.pg_chunk.va,
&hlen); &hlen);
__pskb_pull_tail(skb, hlen); __pskb_pull_tail(skb, hlen);
......
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