Commit 3913ba73 authored by David S. Miller's avatar David S. Miller

Merge branch 'mvpp2-warnings'

Matteo Croce says:

====================
mvpp2: resolve two warnings

Just two small changes to suppress two warnings.
====================
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 1f975aba 4c598e5e
...@@ -3784,9 +3784,9 @@ mvpp2_xdp_xmit(struct net_device *dev, int num_frame, ...@@ -3784,9 +3784,9 @@ mvpp2_xdp_xmit(struct net_device *dev, int num_frame,
} }
static int static int
mvpp2_run_xdp(struct mvpp2_port *port, struct mvpp2_rx_queue *rxq, mvpp2_run_xdp(struct mvpp2_port *port, struct bpf_prog *prog,
struct bpf_prog *prog, struct xdp_buff *xdp, struct xdp_buff *xdp, struct page_pool *pp,
struct page_pool *pp, struct mvpp2_pcpu_stats *stats) struct mvpp2_pcpu_stats *stats)
{ {
unsigned int len, sync, err; unsigned int len, sync, err;
struct page *page; struct page *page;
...@@ -3925,7 +3925,7 @@ static int mvpp2_rx(struct mvpp2_port *port, struct napi_struct *napi, ...@@ -3925,7 +3925,7 @@ static int mvpp2_rx(struct mvpp2_port *port, struct napi_struct *napi,
MVPP2_MH_SIZE + MVPP2_SKB_HEADROOM, MVPP2_MH_SIZE + MVPP2_SKB_HEADROOM,
rx_bytes, false); rx_bytes, false);
ret = mvpp2_run_xdp(port, rxq, xdp_prog, &xdp, pp, &ps); ret = mvpp2_run_xdp(port, xdp_prog, &xdp, pp, &ps);
if (ret) { if (ret) {
xdp_ret |= ret; xdp_ret |= ret;
......
...@@ -394,9 +394,6 @@ static int mvpp2_prs_tcam_first_free(struct mvpp2 *priv, unsigned char start, ...@@ -394,9 +394,6 @@ static int mvpp2_prs_tcam_first_free(struct mvpp2 *priv, unsigned char start,
if (start > end) if (start > end)
swap(start, end); swap(start, end);
if (end >= MVPP2_PRS_TCAM_SRAM_SIZE)
end = MVPP2_PRS_TCAM_SRAM_SIZE - 1;
for (tid = start; tid <= end; tid++) { for (tid = start; tid <= end; tid++) {
if (!priv->prs_shadow[tid].valid) if (!priv->prs_shadow[tid].valid)
return tid; return tid;
......
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