From cf1f309d248ddfd0c9015f27d8a3a5cd38c8708b Mon Sep 17 00:00:00 2001
From: Patrick McHardy <kaber@trash.net>
Date: Wed, 7 Nov 2007 01:31:32 -0800
Subject: [PATCH] --- yaml --- r: 73277 b: refs/heads/master c:
 fffe470a803e7f7b74c016291e542a0162761209 h: refs/heads/master i:   73275:
 8f1d0c55a6154da0a2af83eecc8753bfb9d18f94 v: v3

---
 [refs]                 | 2 +-
 trunk/net/8021q/vlan.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index f21883a72ff2..4c1d86a539c9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 45a19b0a725a04f3255d9d3da1fca30bb97f1481
+refs/heads/master: fffe470a803e7f7b74c016291e542a0162761209
diff --git a/trunk/net/8021q/vlan.c b/trunk/net/8021q/vlan.c
index 3fe4fc86055f..1037748c14db 100644
--- a/trunk/net/8021q/vlan.c
+++ b/trunk/net/8021q/vlan.c
@@ -747,6 +747,7 @@ static int vlan_ioctl_handler(struct net *net, void __user *arg)
 		vlan_dev_set_ingress_priority(dev,
 					      args.u.skb_priority,
 					      args.vlan_qos);
+		err = 0;
 		break;
 
 	case SET_VLAN_EGRESS_PRIORITY_CMD: