diff options
| author | Jiri Pirko <jpirko@redhat.com> | 2012-06-29 07:10:05 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-06-30 10:08:00 +0200 |
| commit | bb35f67195fcdbe79faa7a15ce148a67c9ab923d (patch) | |
| tree | d02ca3cb76bec3d9f0c86b0a44c49478e5e9c0d1 | |
| parent | netlink: add nlk->netlink_bind hook for module auto-loading (diff) | |
| download | linux-bb35f67195fcdbe79faa7a15ce148a67c9ab923d.tar.xz linux-bb35f67195fcdbe79faa7a15ce148a67c9ab923d.zip | |
net: introduce new priv_flag indicating iface capable of change mac when running
Introduce IFF_LIVE_ADDR_CHANGE priv_flag and use it to disable
netif_running() check in eth_mac_addr()
Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | include/linux/if.h | 2 | ||||
| -rw-r--r-- | net/ethernet/eth.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/if.h b/include/linux/if.h index f995c663c493..1ec407b01e46 100644 --- a/include/linux/if.h +++ b/include/linux/if.h @@ -81,6 +81,8 @@ #define IFF_UNICAST_FLT 0x20000 /* Supports unicast filtering */ #define IFF_TEAM_PORT 0x40000 /* device used as team port */ #define IFF_SUPP_NOFCS 0x80000 /* device supports sending custom FCS */ +#define IFF_LIVE_ADDR_CHANGE 0x100000 /* device supports hardware address + * change when it's running */ #define IF_GET_IFACE 0x0001 /* for querying only */ diff --git a/net/ethernet/eth.c b/net/ethernet/eth.c index 36e58800a9e3..db6a6c17d790 100644 --- a/net/ethernet/eth.c +++ b/net/ethernet/eth.c @@ -283,7 +283,7 @@ int eth_mac_addr(struct net_device *dev, void *p) { struct sockaddr *addr = p; - if (netif_running(dev)) + if (!(dev->priv_flags & IFF_LIVE_ADDR_CHANGE) && netif_running(dev)) return -EBUSY; if (!is_valid_ether_addr(addr->sa_data)) return -EADDRNOTAVAIL; |