From a09c9dff8eceb08d03154549968a21afef02d032 Mon Sep 17 00:00:00 2001
From: Danny Kukawka <danny.kukawka@bisect.de>
Date: Tue, 21 Feb 2012 02:07:52 +0000
Subject: [PATCH] --- yaml --- r: 290432 b: refs/heads/master c:
 7ca1e11ab7d83ec76f3a8ef8704adca8c7518f41 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/net/bridge/br_device.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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)) {