From 4f00606024e8cba2a6ed5e5f0d71f6ddf381bd53 Mon Sep 17 00:00:00 2001 From: Mehak Mahajan Date: Tue, 30 Oct 2012 15:50:28 -0700 Subject: [PATCH] --- yaml --- r: 336087 b: refs/heads/master c: d04d382980c86bdee9960c3eb157a73f8ed230cc h: refs/heads/master i: 336085: a9d61b6843c6e675ed366d6ddeb42e769cf9aadc 336083: 89c89d977dfc97a61596875aa2679a4e7e73ce77 336079: 38222bad714e11bdc5a1fee3c8c3d903df6be380 v: v3 --- [refs] | 2 +- trunk/net/openvswitch/flow.c | 14 +++++--------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index a23e32b2b23d..2439a4d7d7a8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c1c92b6a5b606e39e2181ac8eee2a0ca847542dc +refs/heads/master: d04d382980c86bdee9960c3eb157a73f8ed230cc diff --git a/trunk/net/openvswitch/flow.c b/trunk/net/openvswitch/flow.c index 98c70630ad06..733cbf49ed1f 100644 --- a/trunk/net/openvswitch/flow.c +++ b/trunk/net/openvswitch/flow.c @@ -702,15 +702,11 @@ int ovs_flow_extract(struct sk_buff *skb, u16 in_port, struct sw_flow_key *key, /* We only match on the lower 8 bits of the opcode. */ if (ntohs(arp->ar_op) <= 0xff) key->ip.proto = ntohs(arp->ar_op); - - if (key->ip.proto == ARPOP_REQUEST - || key->ip.proto == ARPOP_REPLY) { - memcpy(&key->ipv4.addr.src, arp->ar_sip, sizeof(key->ipv4.addr.src)); - memcpy(&key->ipv4.addr.dst, arp->ar_tip, sizeof(key->ipv4.addr.dst)); - memcpy(key->ipv4.arp.sha, arp->ar_sha, ETH_ALEN); - memcpy(key->ipv4.arp.tha, arp->ar_tha, ETH_ALEN); - key_len = SW_FLOW_KEY_OFFSET(ipv4.arp); - } + memcpy(&key->ipv4.addr.src, arp->ar_sip, sizeof(key->ipv4.addr.src)); + memcpy(&key->ipv4.addr.dst, arp->ar_tip, sizeof(key->ipv4.addr.dst)); + memcpy(key->ipv4.arp.sha, arp->ar_sha, ETH_ALEN); + memcpy(key->ipv4.arp.tha, arp->ar_tha, ETH_ALEN); + key_len = SW_FLOW_KEY_OFFSET(ipv4.arp); } } else if (key->eth.type == htons(ETH_P_IPV6)) { int nh_len; /* IPv6 Header + Extensions */