This series removes skb_make_writable. All users are converted to skb_ensure_writable. In Hindsight, skb_ensure_writable() should never have been added to the tree, and instead we should have moved skb_make_writable to the core. What happened instead that skb_ensure_writable was added to OVS, then moved to core, then extended in functionality until the point it has the same effect and same pre and post-conditions as skb_make_writable. So, remove skb_make_writable and use the new function everywhere. Patch 1 has a more detailed explanation/walkthrough of the two functions and their pre and post-conditions. Florian Westphal (8): netfilter: bridge: convert skb_make_writable to skb_ensure_writable netfilter: ipvs: prefer skb_ensure_writable netfilter: conntrack, nat: prefer skb_ensure_writable netfilter: ipv4: prefer skb_ensure_writable netfilter: nf_tables: prefer skb_ensure_writable netfilter: xt_HL: prefer skb_ensure_writable netfilter: tcpmss, optstrip: prefer skb_ensure_writable netfilter: replace skb_make_writable with skb_ensure_writable include/linux/netfilter.h | 5 ----- net/bridge/netfilter/ebt_dnat.c | 2 +- net/bridge/netfilter/ebt_redirect.c | 2 +- net/bridge/netfilter/ebt_snat.c | 2 +- net/ipv4/netfilter/arpt_mangle.c | 2 +- net/ipv4/netfilter/ipt_ECN.c | 4 ++-- net/ipv4/netfilter/nf_nat_h323.c | 2 +- net/ipv4/netfilter/nf_nat_snmp_basic_main.c | 2 +- net/netfilter/core.c | 22 ---------------------- net/netfilter/ipvs/ip_vs_app.c | 4 ++-- net/netfilter/ipvs/ip_vs_core.c | 4 ++-- net/netfilter/ipvs/ip_vs_ftp.c | 4 ++-- net/netfilter/ipvs/ip_vs_proto_sctp.c | 4 ++-- net/netfilter/ipvs/ip_vs_proto_tcp.c | 4 ++-- net/netfilter/ipvs/ip_vs_proto_udp.c | 4 ++-- net/netfilter/ipvs/ip_vs_xmit.c | 12 ++++++------ net/netfilter/nf_conntrack_proto_sctp.c | 2 +- net/netfilter/nf_conntrack_seqadj.c | 4 ++-- net/netfilter/nf_nat_helper.c | 4 ++-- net/netfilter/nf_nat_proto.c | 24 ++++++++++++------------ net/netfilter/nf_nat_sip.c | 2 +- net/netfilter/nf_synproxy_core.c | 2 +- net/netfilter/nfnetlink_queue.c | 2 +- net/netfilter/nft_exthdr.c | 3 ++- net/netfilter/nft_payload.c | 6 +++--- net/netfilter/xt_DSCP.c | 8 ++++---- net/netfilter/xt_HL.c | 4 ++-- net/netfilter/xt_TCPMSS.c | 2 +- net/netfilter/xt_TCPOPTSTRIP.c | 28 +++++++++++++--------------- 29 files changed, 71 insertions(+), 99 deletions(-)