diff options
| author |   David S. Miller <davem@davemloft.net> | 2017-06-30 12:43:08 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-06-30 12:43:08 -0400 |
| commit | b07911593719828cac023bdcf6bf4da1c9ba546f (patch) | |
| tree | c4d2f66e6f2506e5b5439ffca0449e646f677b33 /drivers/net/ethernet/rocker | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | linux-dev-b07911593719828cac023bdcf6bf4da1c9ba546f.tar.xz linux-dev-b07911593719828cac023bdcf6bf4da1c9ba546f.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
A set of overlapping changes in macvlan and the rocker
driver, nothing serious.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/rocker')
| -rw-r--r-- | drivers/net/ethernet/rocker/rocker_ofdpa.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/rocker/rocker_ofdpa.c b/drivers/net/ethernet/rocker/rocker_ofdpa.c index bd0e3f157e9e..600e30e8f0be 100644 --- a/drivers/net/ethernet/rocker/rocker_ofdpa.c +++ b/drivers/net/ethernet/rocker/rocker_ofdpa.c @@ -1409,8 +1409,8 @@ static int ofdpa_port_ipv4_nh(struct ofdpa_port *ofdpa_port, *index = entry->index; resolved = false; } else if (removing) { - ofdpa_neigh_del(found); *index = found->index; + ofdpa_neigh_del(found); } else if (updating) { ofdpa_neigh_update(found, NULL, false); resolved = !is_zero_ether_addr(found->eth_dst); |