From c3f8af53e8fd42f428f23e77749abe434992293a Mon Sep 17 00:00:00 2001
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Fri, 20 May 2011 14:59:23 -0400
Subject: [PATCH] --- yaml --- r: 247748 b: refs/heads/master c:
 d93515611bbc70c2fe4db232e5feb448ed8e4cc9 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/net/macvlan.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 69fd2810c58c..ea31aee26c64 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7196cd6c3d4863000ef88b09f34d6dd75610ec3e
+refs/heads/master: d93515611bbc70c2fe4db232e5feb448ed8e4cc9
diff --git a/trunk/drivers/net/macvlan.c b/trunk/drivers/net/macvlan.c
index 07bcb8084d78..bbcf80afaf16 100644
--- a/trunk/drivers/net/macvlan.c
+++ b/trunk/drivers/net/macvlan.c
@@ -585,8 +585,8 @@ static int macvlan_port_create(struct net_device *dev)
 	err = netdev_rx_handler_register(dev, macvlan_handle_frame, port);
 	if (err)
 		kfree(port);
-
-	dev->priv_flags |= IFF_MACVLAN_PORT;
+	else
+		dev->priv_flags |= IFF_MACVLAN_PORT;
 	return err;
 }