X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=datapath%2Factions.c;h=0a2def67763cddff2af121d9fee88f3e325ba876;hb=d1d71a36446d2322986038fdb0402cc8ed53079a;hp=09d0c3f1bd6f73c5089c3337e4dc715027ba0114;hpb=f4104c68823df93064b8997e5ca0e0564704bc87;p=sliver-openvswitch.git

diff --git a/datapath/actions.c b/datapath/actions.c
index 09d0c3f1b..0a2def677 100644
--- a/datapath/actions.c
+++ b/datapath/actions.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007-2012 Nicira, Inc.
+ * Copyright (c) 2007-2013 Nicira, Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
@@ -384,8 +384,10 @@ static int output_userspace(struct datapath *dp, struct sk_buff *skb,
 	const struct nlattr *a;
 	int rem;
 
+	BUG_ON(!OVS_CB(skb)->pkt_key);
+
 	upcall.cmd = OVS_PACKET_CMD_ACTION;
-	upcall.key = &OVS_CB(skb)->flow->key;
+	upcall.key = OVS_CB(skb)->pkt_key;
 	upcall.userdata = NULL;
 	upcall.portid = 0;