summaryrefslogtreecommitdiff
path: root/datapath/datapath.c
diff options
context:
space:
mode:
authorThomas Graf <tgraf@noironetworks.com>2015-01-07 12:55:49 +0100
committerThomas Graf <tgraf@noironetworks.com>2015-01-07 12:55:49 +0100
commit1f649f1c8d4e86e0b28baf1a9508f3ed09bd3d34 (patch)
tree02f0b1ee1c522bafc02b1979b8fc24dd16a6ce6d /datapath/datapath.c
parentf066424208924681f5ef8fb1e7cb7b33ba74f026 (diff)
downloadopenvswitch-1f649f1c8d4e86e0b28baf1a9508f3ed09bd3d34.tar.gz
datapath: Account for rename to vlan_insert_tag_set_proto()
__vlan_put_tag() was renamed to vlan_insert_tag_set_proto() with the argument list kept intact. Upstream: 62749e ("vlan: rename __vlan_put_tag to vlan_insert_tag_set_proto") Signed-off-by: Thomas Graf <tgraf@noironetworks.com> Acked-by: Pravin B Shelar <pshelar@nicira.com>
Diffstat (limited to 'datapath/datapath.c')
-rw-r--r--datapath/datapath.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/datapath/datapath.c b/datapath/datapath.c
index 360717039..ebab68c7d 100644
--- a/datapath/datapath.c
+++ b/datapath/datapath.c
@@ -428,7 +428,7 @@ static int queue_userspace_packet(struct datapath *dp, struct sk_buff *skb,
if (!nskb)
return -ENOMEM;
- nskb = __vlan_put_tag(nskb, nskb->vlan_proto, vlan_tx_tag_get(nskb));
+ nskb = vlan_insert_tag_set_proto(nskb, nskb->vlan_proto, vlan_tx_tag_get(nskb));
if (!nskb)
return -ENOMEM;