diff options
| author | David S. Miller <davem@davemloft.net> | 2017-02-09 22:59:36 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-02-09 22:59:36 -0500 |
| commit | a507c346b7fdc97296fa74626df49fdb7296a04e (patch) | |
| tree | e1a5001b3df43bc608a143fc16c6a7f2ff039807 | |
| parent | 9878f60240f786286ebfaa8ff9227ef38da1720c (diff) | |
| parent | 316d4d78cf9b6795b83f97c45368748741df418c (diff) | |
Merge branch 'openvswitch-Conntrack-integration-improvements'
| -rw-r--r-- | include/uapi/linux/openvswitch.h | 33 | ||||
| -rw-r--r-- | net/openvswitch/actions.c | 2 | ||||
| -rw-r--r-- | net/openvswitch/conntrack.c | 296 | ||||
| -rw-r--r-- | net/openvswitch/conntrack.h | 14 | ||||
| -rw-r--r-- | net/openvswitch/flow.c | 34 | ||||
| -rw-r--r-- | net/openvswitch/flow.h | 55 | ||||
| -rw-r--r-- | net/openvswitch/flow_netlink.c | 92 | ||||
| -rw-r--r-- | net/openvswitch/flow_netlink.h | 7 |
8 files changed, 420 insertions, 113 deletions
diff --git a/include/uapi/linux/openvswitch.h b/include/uapi/linux/openvswitch.h |