/include/net/caif/

-private-remove&id=a507c346b7fdc97296fa74626df49fdb7296a04e'>diff
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2017-02-09 22:59:36 -0500
committerDavid S. Miller <davem@davemloft.net>2017-02-09 22:59:36 -0500
commita507c346b7fdc97296fa74626df49fdb7296a04e (patch)
treee1a5001b3df43bc608a143fc16c6a7f2ff039807
parent9878f60240f786286ebfaa8ff9227ef38da1720c (diff)
parent316d4d78cf9b6795b83f97c45368748741df418c (diff)
Merge branch 'openvswitch-Conntrack-integration-improvements'
Diffstat
-rw-r--r--include/uapi/linux/openvswitch.h33
-rw-r--r--net/openvswitch/actions.c2
-rw-r--r--net/openvswitch/conntrack.c296
-rw-r--r--net/openvswitch/conntrack.h14
-rw-r--r--net/openvswitch/flow.c34
-rw-r--r--net/openvswitch/flow.h55
-rw-r--r--net/openvswitch/flow_netlink.c92
-rw-r--r--net/openvswitch/flow_netlink.h7
8 files changed, 420 insertions, 113 deletions
diff --git a/include/uapi/linux/openvswitch.h b/include/uapi/linux/openvswitch.h