Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Several cases of overlapping changes, except the packet scheduler
conflicts which deal with the addition of the free list parameter
to qdisc_enqueue().

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 12 insertions, 2 deletions

diff --git a/net/openvswitch/conntrack.c b/net/openvswitch/conntrack.c
index 52f3b9b89e97..b4069a90e375 100644
--- a/net/openvswitch/conntrack.c
+++ b/net/openvswitch/conntrack.c
@@ -818,8 +818,18 @@ static int ovs_ct_lookup(struct net *net, struct sw_flow_key *key,
                  */
                 state = OVS_CS_F_TRACKED | OVS_CS_F_NEW | OVS_CS_F_RELATED;
                 __ovs_ct_update_key(key, state, &info->zone, exp->master);
-        } else
-                return __ovs_ct_lookup(net, key, info, skb);
+        } else {
+                struct nf_conn *ct;
+                int err;
+
+                err = __ovs_ct_lookup(net, key, info, skb);
+                if (err)
+                        return err;
+
+                ct = (struct nf_conn *)skb->nfct;
+                if (ct)
+                        nf_ct_deliver_cached_events(ct);
+        }
 
         return 0;
 }