diff options
| author | David S. Miller <davem@davemloft.net> | 2013-11-08 04:29:06 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-11-08 04:29:06 +0400 |
| commit | 0b2e2d36d152a94082f05ad226a290d765ffb7d2 (patch) | |
| tree | e4db3f844522adf5a62a7ce1fc3cee5cd177673a /include/net | |
| parent | b5ad795e52dae6e9f88b193a5e779b70005d005c (diff) | |
| parent | bc32383cd6496d595e6a25cdc7cff1da6b694462 (diff) | |
| download | linux-0b2e2d36d152a94082f05ad226a290d765ffb7d2.tar.xz | |
Merge branch 'pskb_put'
Mathias Krause says:
====================
move pskb_put (was: IPsec improvements)
This series moves pskb_put() to the core code, making the code
duplication in caif obsolete (patches 1 and 2).
Patch 3 fixes a few kernel-doc issues.
v2 of this series does no longer contain the skb_cow_data() patch and
therefore no performance improvements for IPsec. The change is still
under discussion, but otherwise independent from the above changes.
Please apply!
v2:
- kernel-doc fixes for pskb_put, as noticed by Ben
- dropped skb_cow_data patch as it's still discussed
- added a kernel-doc fixes patch (patch 3)
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/esp.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/net/esp.h b/include/net/esp.h index c92213c38312..a43be85aedc4 100644 --- a/include/net/esp.h +++ b/include/net/esp.h @@ -3,8 +3,6 @@ #include <linux/skbuff.h> -void *pskb_put(struct sk_buff *skb, struct sk_buff *tail, int len); - struct ip_esp_hdr; static inline struct ip_esp_hdr *ip_esp_hdr(const struct sk_buff *skb) |