diff --git a/[refs] b/[refs]
index 48a7c6db3384..7e2a8e73f023 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 22e3880a76bb9a0c4fa5c8fefdc8697a36a4dae1
+refs/heads/master: 5d9633523f27dfcaac2d6052c7b3278311f77949
diff --git a/trunk/net/openvswitch/vport.c b/trunk/net/openvswitch/vport.c
index f6b8132ce4cb..71a2de8726cb 100644
--- a/trunk/net/openvswitch/vport.c
+++ b/trunk/net/openvswitch/vport.c
@@ -301,17 +301,19 @@ void ovs_vport_get_stats(struct vport *vport, struct ovs_vport_stats *stats)
 int ovs_vport_get_options(const struct vport *vport, struct sk_buff *skb)
 {
 	struct nlattr *nla;
+	int err;
+
+	if (!vport->ops->get_options)
+		return 0;
 
 	nla = nla_nest_start(skb, OVS_VPORT_ATTR_OPTIONS);
 	if (!nla)
 		return -EMSGSIZE;
 
-	if (vport->ops->get_options) {
-		int err = vport->ops->get_options(vport, skb);
-		if (err) {
-			nla_nest_cancel(skb, nla);
-			return err;
-		}
+	err = vport->ops->get_options(vport, skb);
+	if (err) {
+		nla_nest_cancel(skb, nla);
+		return err;
 	}
 
 	nla_nest_end(skb, nla);