diff options
| author | Yuval Mintz <Yuval.Mintz@qlogic.com> | 2014-08-28 08:07:32 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-08-29 20:34:59 -0700 |
| commit | 56daf66d3ca9558a71683779eec4f03c878f4de2 (patch) | |
| tree | 0ddae7a8e3af6af237e29a1aa4a76b050eb8e75c /drivers/net/ethernet/broadcom | |
| parent | 918bbc4ffdb84e9d2696315e427a6c43de65bc01 (diff) | |
| download | blackbird-op-linux-56daf66d3ca9558a71683779eec4f03c878f4de2.tar.gz blackbird-op-linux-56daf66d3ca9558a71683779eec4f03c878f4de2.zip | |
bnx2x: Fix sparse warnings
This fixes a sprase warning introduced recently by commit
eeed018cbfa30 ("bnx2x: Add timestamping and PTP hardware clock support"),
as well as another unrelated sparse endian issue.
Signed-off-by: Yuval Mintz <Yuval.Mintz@qlogic.com>
Signed-off-by: Ariel Elior <Ariel.Elior@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/broadcom')
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c index a54ac4560900..06d6d3c9316b 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c @@ -1065,7 +1065,7 @@ reuse_rx: skb_record_rx_queue(skb, fp->rx_queue); /* Check if this packet was timestamped */ - if (unlikely(le16_to_cpu(cqe->fast_path_cqe.type_error_flags) & + if (unlikely(cqe->fast_path_cqe.type_error_flags & (1 << ETH_FAST_PATH_RX_CQE_PTP_PKT_SHIFT))) bnx2x_set_rx_ts(bp, skb); diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c index 38acecdd8e9b..19d0c1152434 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c @@ -4063,6 +4063,13 @@ static int bnx2x_setup_rss(struct bnx2x *bp, if (test_bit(BNX2X_RSS_GRE_INNER_HDRS, &p->rss_flags)) caps |= ETH_RSS_UPDATE_RAMROD_DATA_GRE_INNER_HDRS_CAPABILITY; + /* RSS keys */ + if (test_bit(BNX2X_RSS_SET_SRCH, &p->rss_flags)) { + memcpy(&data->rss_key[0], &p->rss_key[0], + sizeof(data->rss_key)); + caps |= ETH_RSS_UPDATE_RAMROD_DATA_UPDATE_RSS_KEY; + } + data->capabilities = cpu_to_le16(caps); /* Hashing mask */ @@ -4084,13 +4091,6 @@ static int bnx2x_setup_rss(struct bnx2x *bp, if (netif_msg_ifup(bp)) bnx2x_debug_print_ind_table(bp, p); - /* RSS keys */ - if (test_bit(BNX2X_RSS_SET_SRCH, &p->rss_flags)) { - memcpy(&data->rss_key[0], &p->rss_key[0], - sizeof(data->rss_key)); - data->capabilities |= ETH_RSS_UPDATE_RAMROD_DATA_UPDATE_RSS_KEY; - } - /* No need for an explicit memory barrier here as long as we * ensure the ordering of writing to the SPQ element * and updating of the SPQ producer which involves a memory |
