X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=datapath%2Fflow.c;h=dbfe5dd733d7692adf84732eef17ff512080fed8;hb=d295e8e97acae13552a5b220d3fbcff8201064a2;hp=b80e0e295082b148085815d75e07d9c19b141491;hpb=90a249dc93ccabd398b64092121b07e5af2d8c2d;p=sliver-openvswitch.git diff --git a/datapath/flow.c b/datapath/flow.c index b80e0e295..dbfe5dd73 100644 --- a/datapath/flow.c +++ b/datapath/flow.c @@ -153,7 +153,7 @@ void flow_deferred_free(struct sw_flow *flow) /* RCU callback used by flow_deferred_free_acts. */ static void rcu_free_acts_callback(struct rcu_head *rcu) { - struct sw_flow_actions *sf_acts = container_of(rcu, + struct sw_flow_actions *sf_acts = container_of(rcu, struct sw_flow_actions, rcu); kfree(sf_acts); } @@ -346,7 +346,7 @@ int flow_extract(struct sk_buff *skb, u16 in_port, struct odp_flow_key *key) key->nw_proto = ntohs(arp->ar_op); } - if (key->nw_proto == ARPOP_REQUEST + if (key->nw_proto == ARPOP_REQUEST || key->nw_proto == ARPOP_REPLY) { memcpy(&key->nw_src, arp->ar_sip, sizeof(key->nw_src)); memcpy(&key->nw_dst, arp->ar_tip, sizeof(key->nw_dst));