Merge tag 'for-linus-timers-conversion-final-v4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux into timers/urgent

Pull the last batch of manual timer conversions from Kees Cook:

 - final batch of "non trivial" timer conversions (multi-tree dependencies,
   things Coccinelle couldn't handle, etc).

 - treewide conversions via Coccinelle, in 4 steps:
   - DEFINE_TIMER() functions converted to struct timer_list * argument
   - init_timer() -> setup_timer()
   - setup_timer() -> timer_setup()
   - setup_timer() -> timer_setup() (with a single embedded structure)

 - deprecated timer API removals (init_timer(), setup_*timer())

 - finalization of new API (remove global casts)

1 files changed, 60 insertions, 0 deletions

diff --git a/net/nsh/nsh.c b/net/nsh/nsh.c
index 58fb827439a8..d7da99a0b0b8 100644
--- a/net/nsh/nsh.c
+++ b/net/nsh/nsh.c
@@ -14,6 +14,66 @@
 #include <net/nsh.h>
 #include <net/tun_proto.h>
 
+int nsh_push(struct sk_buff *skb, const struct nshhdr *pushed_nh)
+{
+        struct nshhdr *nh;
+        size_t length = nsh_hdr_len(pushed_nh);
+        u8 next_proto;
+
+        if (skb->mac_len) {
+                next_proto = TUN_P_ETHERNET;
+        } else {
+                next_proto = tun_p_from_eth_p(skb->protocol);
+                if (!next_proto)
+                        return -EAFNOSUPPORT;
+        }
+
+        /* Add the NSH header */
+        if (skb_cow_head(skb, length) < 0)
+                return -ENOMEM;
+
+        skb_push(skb, length);
+        nh = (struct nshhdr *)(skb->data);
+        memcpy(nh, pushed_nh, length);
+        nh->np = next_proto;
+        skb_postpush_rcsum(skb, nh, length);
+
+        skb->protocol = htons(ETH_P_NSH);
+        skb_reset_mac_header(skb);
+        skb_reset_network_header(skb);
+        skb_reset_mac_len(skb);
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(nsh_push);
+
+int nsh_pop(struct sk_buff *skb)
+{
+        struct nshhdr *nh;
+        size_t length;
+        __be16 inner_proto;
+
+        if (!pskb_may_pull(skb, NSH_BASE_HDR_LEN))
+                return -ENOMEM;
+        nh = (struct nshhdr *)(skb->data);
+        length = nsh_hdr_len(nh);
+        inner_proto = tun_p_to_eth_p(nh->np);
+        if (!pskb_may_pull(skb, length))
+                return -ENOMEM;
+
+        if (!inner_proto)
+                return -EAFNOSUPPORT;
+
+        skb_pull_rcsum(skb, length);
+        skb_reset_mac_header(skb);
+        skb_reset_network_header(skb);
+        skb_reset_mac_len(skb);
+        skb->protocol = inner_proto;
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(nsh_pop);
+
 static struct sk_buff *nsh_gso_segment(struct sk_buff *skb,
                                        netdev_features_t features)
 {