diff options
| author | David S. Miller <davem@davemloft.net> | 2019-02-09 02:00:17 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-02-09 02:00:17 +0300 |
| commit | a655fe9f194842693258f43b5382855db1c2f654 (patch) | |
| tree | a6e523c42378f43881c421530941dcbb529461ab /drivers/net/ipvlan | |
| parent | 7499a288bf1a4a49be9d72beb0a5c7b9aa6ffec9 (diff) | |
| parent | 27b4ad621e887ce8e5eb508a0103f13d30f6b38a (diff) | |
| download | linux-a655fe9f194842693258f43b5382855db1c2f654.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
An ipvlan bug fix in 'net' conflicted with the abstraction away
of the IPV6 specific support in 'net-next'.
Similarly, a bug fix for mlx5 in 'net' conflicted with the flow
action conversion in 'net-next'.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ipvlan')
| -rw-r--r-- | drivers/net/ipvlan/ipvlan_l3s.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ipvlan/ipvlan_l3s.c b/drivers/net/ipvlan/ipvlan_l3s.c index 9a2f24078a54..d17480a911a3 100644 --- a/drivers/net/ipvlan/ipvlan_l3s.c +++ b/drivers/net/ipvlan/ipvlan_l3s.c @@ -209,7 +209,7 @@ int ipvlan_l3s_register(struct ipvl_port *port) ret = ipvlan_register_nf_hook(read_pnet(&port->pnet)); if (!ret) { dev->l3mdev_ops = &ipvl_l3mdev_ops; - dev->priv_flags |= IFF_L3MDEV_MASTER; + dev->priv_flags |= IFF_L3MDEV_RX_HANDLER; } return ret; @@ -221,7 +221,7 @@ void ipvlan_l3s_unregister(struct ipvl_port *port) ASSERT_RTNL(); - dev->priv_flags &= ~IFF_L3MDEV_MASTER; + dev->priv_flags &= ~IFF_L3MDEV_RX_HANDLER; ipvlan_unregister_nf_hook(read_pnet(&port->pnet)); dev->l3mdev_ops = NULL; } |