History

Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next

Pablo Neira Ayuso says: ==================== Netfilter/IPVS updates for net-next The following patchset container Netfilter/IPVS update for net-next: 1) Add UDP tunnel support for ICMP errors in IPVS. Julian Anastasov says: This patchset is a followup to the commit that adds UDP/GUE tunnel: "ipvs: allow tunneling with gue encapsulation". What we do is to put tunnel real servers in hash table (patch 1), add function to lookup tunnels (patch 2) and use it to strip the embedded tunnel headers from ICMP errors (patch 3). 2) Extend xt_owner to match for supplementary groups, from Lukasz Pawelczyk. 3) Remove unused oif field in flow_offload_tuple object, from Taehee Yoo. 4) Release basechain counters from workqueue to skip synchronize_rcu() call. From Florian Westphal. 5) Replace skb_make_writable() by skb_ensure_writable(). Patchset from Florian Westphal. 6) Checksum support for gue encapsulation in IPVS, from Jacky Hu. ====================

David S. Miller committed 7 years ago

Commit c1e9e012 parents 0462eaa 29930e337 files · +389 −149Browse files

Showing the changes to include/linux (1 of 37 files). Show all

Unified · Split

include/linux/netfilter.h+0−5
@@ -336,11 +336,6 @@ int compat_nf_getsockopt(struct sock *sk, u_int8_t pf, int optval, · 335 unmodified lines
336 char __user *opt, int *len);336 char __user *opt, int *len);
337#endif337#endif
338 338
339/* Call this before modifying an existing packet: ensures it is
340 modifiable and linear to the point you care about (writable_len).
341 Returns true or false. */
342int skb_make_writable(struct sk_buff *skb, unsigned int writable_len);
343
344struct flowi;339struct flowi;
345struct nf_queue_entry;340struct nf_queue_entry;
346 341

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t