diff options
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/hyperv/netvsc_drv.c | 2 | ||||
| -rw-r--r-- | drivers/net/ipvlan/ipvlan_main.c | 12 | ||||
| -rw-r--r-- | drivers/net/vrf.c | 4 |
3 files changed, 11 insertions, 7 deletions
diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c index c65620adab52..18b5584d6377 100644 --- a/drivers/net/hyperv/netvsc_drv.c +++ b/drivers/net/hyperv/netvsc_drv.c | |||
| @@ -1993,7 +1993,7 @@ static void __netvsc_vf_setup(struct net_device *ndev, | |||
| 1993 | "unable to change mtu to %u\n", ndev->mtu); | 1993 | "unable to change mtu to %u\n", ndev->mtu); |
| 1994 | 1994 | ||
| 1995 | /* set multicast etc flags on VF */ | 1995 | /* set multicast etc flags on VF */ |
| 1996 | dev_change_flags(vf_netdev, ndev->flags | IFF_SLAVE); | 1996 | dev_change_flags(vf_netdev, ndev->flags | IFF_SLAVE, NULL); |
| 1997 | 1997 | ||
| 1998 | /* sync address list from ndev to VF */ | 1998 | /* sync address list from ndev to VF */ |
| 1999 | netif_addr_lock_bh(ndev); | 1999 | netif_addr_lock_bh(ndev); |
diff --git a/drivers/net/ipvlan/ipvlan_main.c b/drivers/net/ipvlan/ipvlan_main.c index 14f1cbd3b96f..c3d3e458f541 100644 --- a/drivers/net/ipvlan/ipvlan_main.c +++ b/drivers/net/ipvlan/ipvlan_main.c | |||
| @@ -85,10 +85,12 @@ static int ipvlan_set_port_mode(struct ipvl_port *port, u16 nval, | |||
| 85 | flags = ipvlan->dev->flags; | 85 | flags = ipvlan->dev->flags; |
| 86 | if (nval == IPVLAN_MODE_L3 || nval == IPVLAN_MODE_L3S) { | 86 | if (nval == IPVLAN_MODE_L3 || nval == IPVLAN_MODE_L3S) { |
| 87 | err = dev_change_flags(ipvlan->dev, | 87 | err = dev_change_flags(ipvlan->dev, |
| 88 | flags | IFF_NOARP); | 88 | flags | IFF_NOARP, |
| 89 | extack); | ||
| 89 | } else { | 90 | } else { |
| 90 | err = dev_change_flags(ipvlan->dev, | 91 | err = dev_change_flags(ipvlan->dev, |
| 91 | flags & ~IFF_NOARP); | 92 | flags & ~IFF_NOARP, |
| 93 | extack); | ||
| 92 | } | 94 | } |
| 93 | if (unlikely(err)) | 95 | if (unlikely(err)) |
| 94 | goto fail; | 96 | goto fail; |
| @@ -117,9 +119,11 @@ fail: | |||
| 117 | flags = ipvlan->dev->flags; | 119 | flags = ipvlan->dev->flags; |
| 118 | if (port->mode == IPVLAN_MODE_L3 || | 120 | if (port->mode == IPVLAN_MODE_L3 || |
| 119 | port->mode == IPVLAN_MODE_L3S) | 121 | port->mode == IPVLAN_MODE_L3S) |
| 120 | dev_change_flags(ipvlan->dev, flags | IFF_NOARP); | 122 | dev_change_flags(ipvlan->dev, flags | IFF_NOARP, |
| 123 | NULL); | ||
| 121 | else | 124 | else |
| 122 | dev_change_flags(ipvlan->dev, flags & ~IFF_NOARP); | 125 | dev_change_flags(ipvlan->dev, flags & ~IFF_NOARP, |
| 126 | NULL); | ||
| 123 | } | 127 | } |
| 124 | 128 | ||
| 125 | return err; | 129 | return err; |
diff --git a/drivers/net/vrf.c b/drivers/net/vrf.c index 1e9f2dc0de07..95909e262ba4 100644 --- a/drivers/net/vrf.c +++ b/drivers/net/vrf.c | |||
| @@ -756,9 +756,9 @@ static void cycle_netdev(struct net_device *dev, | |||
| 756 | if (!netif_running(dev)) | 756 | if (!netif_running(dev)) |
| 757 | return; | 757 | return; |
| 758 | 758 | ||
| 759 | ret = dev_change_flags(dev, flags & ~IFF_UP); | 759 | ret = dev_change_flags(dev, flags & ~IFF_UP, extack); |
| 760 | if (ret >= 0) | 760 | if (ret >= 0) |
| 761 | ret = dev_change_flags(dev, flags); | 761 | ret = dev_change_flags(dev, flags, extack); |
| 762 | 762 | ||
| 763 | if (ret < 0) { | 763 | if (ret < 0) { |
| 764 | netdev_err(dev, | 764 | netdev_err(dev, |
