diff --git a/[refs] b/[refs]
index d72abe210833..a37aafddd9c2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 15b8f4cf8ea6654c5642358c70b6e84909d99038
+refs/heads/master: 7ca1e11ab7d83ec76f3a8ef8704adca8c7518f41
diff --git a/trunk/net/bridge/br_device.c b/trunk/net/bridge/br_device.c
index a157bf827d87..ba829de84423 100644
--- a/trunk/net/bridge/br_device.c
+++ b/trunk/net/bridge/br_device.c
@@ -167,7 +167,7 @@ static int br_set_mac_address(struct net_device *dev, void *p)
 	struct sockaddr *addr = p;
 
 	if (!is_valid_ether_addr(addr->sa_data))
-		return -EINVAL;
+		return -EADDRNOTAVAIL;
 
 	spin_lock_bh(&br->lock);
 	if (compare_ether_addr(dev->dev_addr, addr->sa_data)) {