git.openwrt.org Git - openwrt/staging/aparcar.git/blob

   1 From 5b8481fa42ac58484d633b558579e302aead64c1 Mon Sep 17 00:00:00 2001
   2 From: "David S. Miller" <davem@davemloft.net>
   3 Date: Mon, 1 May 2017 15:10:20 -0400
   4 Subject: [PATCH] ipv6: Need to export ipv6_push_frag_opts for tunneling now.
   5
   6 Since that change also made the nfrag function not necessary
   7 for exports, remove it.
   8
   9 Fixes: 89a23c8b528b ("ip6_tunnel: Fix missing tunnel encapsulation limit option")
  10 Signed-off-by: David S. Miller <davem@davemloft.net>
  11 ---
  12  net/ipv6/exthdrs.c | 2 +-
  13  1 file changed, 1 insertion(+), 1 deletion(-)
  14
  15 diff --git a/net/ipv6/exthdrs.c b/net/ipv6/exthdrs.c
  16 index d32e2110aff2..b636f1da9aec 100644
  17 --- a/net/ipv6/exthdrs.c
  18 +++ b/net/ipv6/exthdrs.c
  19 @@ -946,13 +946,13 @@ void ipv6_push_nfrag_opts(struct sk_buff *skb, struct ipv6_txoptions *opt,
  20         if (opt->hopopt)
  21                 ipv6_push_exthdr(skb, proto, NEXTHDR_HOP, opt->hopopt);
  22  }
  23 -EXPORT_SYMBOL(ipv6_push_nfrag_opts);
  24
  25  void ipv6_push_frag_opts(struct sk_buff *skb, struct ipv6_txoptions *opt, u8 *proto)
  26  {
  27         if (opt->dst1opt)
  28                 ipv6_push_exthdr(skb, proto, NEXTHDR_DEST, opt->dst1opt);
  29  }
  30 +EXPORT_SYMBOL(ipv6_push_frag_opts);
  31
  32  struct ipv6_txoptions *
  33  ipv6_dup_options(struct sock *sk, struct ipv6_txoptions *opt)
  34 --
  35 2.17.1
  36