diff options
| author | Pravin B Shelar <pshelar@nicira.com> | 2014-09-16 04:15:28 +0200 |
|---|---|---|
| committer | Pravin B Shelar <pshelar@nicira.com> | 2014-09-16 08:28:13 +0200 |
| commit | 2ff3e4e4868675da1024175215991fa6d9856731 (patch) | |
| tree | 4734d124ac5208aff9445e59054e856a9126eda0 /net/openvswitch/datapath.h | |
| parent | net: dsa: fix mii_bus to host_dev replacement (diff) | |
| download | linux-2ff3e4e4868675da1024175215991fa6d9856731.tar.xz linux-2ff3e4e4868675da1024175215991fa6d9856731.zip | |
openvswitch: Remove pkt_key from OVS_CB
OVS keeps pointer to packet key in skb->cb, but the packet key is
store on stack. This could make code bit tricky. So it is better to
get rid of the pointer.
Signed-off-by: Pravin B Shelar <pshelar@nicira.com>
Diffstat (limited to 'net/openvswitch/datapath.h')
| -rw-r--r-- | net/openvswitch/datapath.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/openvswitch/datapath.h b/net/openvswitch/datapath.h index 701b5738c38a..b576483aab7c 100644 --- a/net/openvswitch/datapath.h +++ b/net/openvswitch/datapath.h @@ -95,13 +95,11 @@ struct datapath { /** * struct ovs_skb_cb - OVS data in skb CB * @flow: The flow associated with this packet. May be %NULL if no flow. - * @pkt_key: The flow information extracted from the packet. Must be nonnull. * @tun_key: Key for the tunnel that encapsulated this packet. NULL if the * packet is not being tunneled. */ struct ovs_skb_cb { struct sw_flow *flow; - struct sw_flow_key *pkt_key; struct ovs_key_ipv4_tunnel *tun_key; }; #define OVS_CB(skb) ((struct ovs_skb_cb *)(skb)->cb) @@ -191,7 +189,8 @@ int ovs_dp_upcall(struct datapath *, struct sk_buff *, struct sk_buff *ovs_vport_cmd_build_info(struct vport *, u32 pid, u32 seq, u8 cmd); -int ovs_execute_actions(struct datapath *dp, struct sk_buff *skb); +int ovs_execute_actions(struct datapath *dp, struct sk_buff *skb, + struct sw_flow_key *); void ovs_dp_notify_wq(struct work_struct *work); #define OVS_NLERR(fmt, ...) \ |