1 files changed, 5 insertions, 3 deletions

diff --git a/net/openvswitch/flow.c b/net/openvswitch/flow.c
index 57e07768c9d1..f54cf17ef7a8 100644
--- a/net/openvswitch/flow.c
+++ b/net/openvswitch/flow.c
@@ -276,10 +276,12 @@ static int parse_ipv6hdr(struct sk_buff *skb, struct sw_flow_key *key)
 
         nexthdr = ipv6_find_hdr(skb, &payload_ofs, -1, &frag_off, &flags);
         if (flags & IP6_FH_F_FRAG) {
-                if (frag_off)
+                if (frag_off) {
                         key->ip.frag = OVS_FRAG_TYPE_LATER;
-                else
-                        key->ip.frag = OVS_FRAG_TYPE_FIRST;
+                        key->ip.proto = nexthdr;
+                        return 0;
+                }
+                key->ip.frag = OVS_FRAG_TYPE_FIRST;
         } else {
                 key->ip.frag = OVS_FRAG_TYPE_NONE;
         }