diff options
| author | David S. Miller <davem@davemloft.net> | 2014-01-07 04:48:38 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-01-07 04:48:38 +0400 |
| commit | 39b6b2992f9dc65d1de5c66e7ec2271b8a5fac33 (patch) | |
| tree | c0fc4e2be0429bb4d7643e6b6f8f5a56212f9284 /include/linux/skbuff.h | |
| parent | 56a4342dfe3145cd66f766adccb28fd9b571606d (diff) | |
| parent | 443cd88c8a31379e95326428bbbd40af25c1d440 (diff) | |
| download | linux-39b6b2992f9dc65d1de5c66e7ec2271b8a5fac33.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jesse/openvswitch
Jesse Gross says:
====================
[GIT net-next] Open vSwitch
Open vSwitch changes for net-next/3.14. Highlights are:
* Performance improvements in the mechanism to get packets to userspace
using memory mapped netlink and skb zero copy where appropriate.
* Per-cpu flow stats in situations where flows are likely to be shared
across CPUs. Standard flow stats are used in other situations to save
memory and allocation time.
* A handful of code cleanups and rationalization.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/skbuff.h')
| -rw-r--r-- | include/linux/skbuff.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 88d4f2ebbec6..956e11a168d8 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -2445,6 +2445,9 @@ int skb_splice_bits(struct sk_buff *skb, unsigned int offset, struct pipe_inode_info *pipe, unsigned int len, unsigned int flags); void skb_copy_and_csum_dev(const struct sk_buff *skb, u8 *to); +unsigned int skb_zerocopy_headlen(const struct sk_buff *from); +void skb_zerocopy(struct sk_buff *to, const struct sk_buff *from, + int len, int hlen); void skb_split(struct sk_buff *skb, struct sk_buff *skb1, const u32 len); int skb_shift(struct sk_buff *tgt, struct sk_buff *skb, int shiftlen); void skb_scrub_packet(struct sk_buff *skb, bool xnet); |