diff options
| author | David S. Miller <davem@davemloft.net> | 2013-01-21 14:14:09 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-01-21 14:14:09 -0500 |
| commit | cd5f20461de8e3e9b04932e4ba3e37afe39b8898 (patch) | |
| tree | 26b31fbcf0995c22b073394946717eba0151fbe5 /include/linux/etherdevice.h | |
| parent | 3fcd550a4b37b1c60b4afce2e4b200919ec8bd20 (diff) | |
| parent | 7e58d5aea8abb993983a3f3088fd4a3f06180a1c (diff) | |
Merge branch 'virtio_mac'
Amos Kong says:
====================
Currenly mac is programmed byte by byte. This means that we
have an intermediate step where mac is wrong.
Third patch introduced a new vq control command to set mac
address, it's atomic.
V2: check return of sending command, delay eth_mac_addr()
V3: restore software address when fail to set hardware address
V4: split eth_mac_addr, fix error handle
V5: rebase patches to net-next tree
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/etherdevice.h')
| -rw-r--r-- | include/linux/etherdevice.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/etherdevice.h b/include/linux/etherdevice.h index 1a43e1b4f7a..c623861964e 100644 --- a/include/linux/etherdevice.h +++ b/include/linux/etherdevice.h @@ -40,6 +40,8 @@ extern int eth_header_cache(const struct neighbour *neigh, struct hh_cache *hh, extern void eth_header_cache_update(struct hh_cache *hh, const struct net_device *dev, const unsigned char *haddr); +extern int eth_prepare_mac_addr_change(struct net_device *dev, void *p); +extern void eth_commit_mac_addr_change(struct net_device *dev, void *p); extern int eth_mac_addr(struct net_device *dev, void *p); extern int eth_change_mtu(struct net_device *dev, int new_mtu); extern int eth_validate_addr(struct net_device *dev); |