Merge branch 'mvpp2-warnings'
Matteo Croce says: ==================== mvpp2: resolve two warnings Just two small changes to suppress two warnings. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Коммит
3913ba732e
|
@ -3784,9 +3784,9 @@ mvpp2_xdp_xmit(struct net_device *dev, int num_frame,
|
|||
}
|
||||
|
||||
static int
|
||||
mvpp2_run_xdp(struct mvpp2_port *port, struct mvpp2_rx_queue *rxq,
|
||||
struct bpf_prog *prog, struct xdp_buff *xdp,
|
||||
struct page_pool *pp, struct mvpp2_pcpu_stats *stats)
|
||||
mvpp2_run_xdp(struct mvpp2_port *port, struct bpf_prog *prog,
|
||||
struct xdp_buff *xdp, struct page_pool *pp,
|
||||
struct mvpp2_pcpu_stats *stats)
|
||||
{
|
||||
unsigned int len, sync, err;
|
||||
struct page *page;
|
||||
|
@ -3925,7 +3925,7 @@ static int mvpp2_rx(struct mvpp2_port *port, struct napi_struct *napi,
|
|||
MVPP2_MH_SIZE + MVPP2_SKB_HEADROOM,
|
||||
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) {
|
||||
xdp_ret |= ret;
|
||||
|
|
|
@ -394,9 +394,6 @@ static int mvpp2_prs_tcam_first_free(struct mvpp2 *priv, unsigned char start,
|
|||
if (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++) {
|
||||
if (!priv->prs_shadow[tid].valid)
|
||||
return tid;
|
||||
|
|
Загрузка…
Ссылка в новой задаче