diff options
| author | David S. Miller <davem@davemloft.net> | 2013-08-28 02:11:18 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-08-28 02:11:18 (GMT) |
| commit | 5b2941b18dc5f60a5c14a5c15693f9c58b0dd922 (patch) | |
| tree | 30351cd35586f3acf9907aa0f3b4ab9d4f7be81f /include/net | |
| parent | b6750b4056720629e4c1e2e0d05f63692bffad27 (diff) | |
| parent | 5828cd9a68873df1340b420371c02c47647878fb (diff) | |
| download | linux-5b2941b18dc5f60a5c14a5c15693f9c58b0dd922.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jesse/openvswitch
Jesse Gross says:
====================
A number of significant new features and optimizations for net-next/3.12.
Highlights are:
* "Megaflows", an optimization that allows userspace to specify which
flow fields were used to compute the results of the flow lookup.
This allows for a major reduction in flow setups (the major
performance bottleneck in Open vSwitch) without reducing flexibility.
* Converting netlink dump operations to use RCU, allowing for
additional parallelism in userspace.
* Matching and modifying SCTP protocol fields.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/ipv6.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/ipv6.h b/include/net/ipv6.h index 5fe5649..7bdff04 100644 --- a/include/net/ipv6.h +++ b/include/net/ipv6.h @@ -41,6 +41,7 @@ #define NEXTHDR_ICMP 58 /* ICMP for IPv6. */ #define NEXTHDR_NONE 59 /* No next header */ #define NEXTHDR_DEST 60 /* Destination options header. */ +#define NEXTHDR_SCTP 132 /* SCTP message. */ #define NEXTHDR_MOBILITY 135 /* Mobility header. */ #define NEXTHDR_MAX 255 |