kernel: import follow-up fix for previous backport
Buildbots complaining made me wonder what's going on...
ERROR: "ipv6_push_frag_opts" [net/ipv6/ip6_tunnel.ko] undefined!
Fixes: 6c81c27efa ("kernel: backport fix for missing tunnel encapsulation limit option")
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
			
			
This commit is contained in:
		| @@ -0,0 +1,36 @@ | |||||||
|  | From 5b8481fa42ac58484d633b558579e302aead64c1 Mon Sep 17 00:00:00 2001 | ||||||
|  | From: "David S. Miller" <davem@davemloft.net> | ||||||
|  | Date: Mon, 1 May 2017 15:10:20 -0400 | ||||||
|  | Subject: [PATCH] ipv6: Need to export ipv6_push_frag_opts for tunneling now. | ||||||
|  |  | ||||||
|  | Since that change also made the nfrag function not necessary | ||||||
|  | for exports, remove it. | ||||||
|  |  | ||||||
|  | Fixes: 89a23c8b528b ("ip6_tunnel: Fix missing tunnel encapsulation limit option") | ||||||
|  | Signed-off-by: David S. Miller <davem@davemloft.net> | ||||||
|  | --- | ||||||
|  |  net/ipv6/exthdrs.c | 2 +- | ||||||
|  |  1 file changed, 1 insertion(+), 1 deletion(-) | ||||||
|  |  | ||||||
|  | diff --git a/net/ipv6/exthdrs.c b/net/ipv6/exthdrs.c | ||||||
|  | index d32e2110aff2..b636f1da9aec 100644 | ||||||
|  | --- a/net/ipv6/exthdrs.c | ||||||
|  | +++ b/net/ipv6/exthdrs.c | ||||||
|  | @@ -946,13 +946,13 @@ void ipv6_push_nfrag_opts(struct sk_buff *skb, struct ipv6_txoptions *opt, | ||||||
|  |  	if (opt->hopopt) | ||||||
|  |  		ipv6_push_exthdr(skb, proto, NEXTHDR_HOP, opt->hopopt); | ||||||
|  |  } | ||||||
|  | -EXPORT_SYMBOL(ipv6_push_nfrag_opts); | ||||||
|  |   | ||||||
|  |  void ipv6_push_frag_opts(struct sk_buff *skb, struct ipv6_txoptions *opt, u8 *proto) | ||||||
|  |  { | ||||||
|  |  	if (opt->dst1opt) | ||||||
|  |  		ipv6_push_exthdr(skb, proto, NEXTHDR_DEST, opt->dst1opt); | ||||||
|  |  } | ||||||
|  | +EXPORT_SYMBOL(ipv6_push_frag_opts); | ||||||
|  |   | ||||||
|  |  struct ipv6_txoptions * | ||||||
|  |  ipv6_dup_options(struct sock *sk, struct ipv6_txoptions *opt) | ||||||
|  | --  | ||||||
|  | 2.17.1 | ||||||
|  |  | ||||||
		Reference in New Issue
	
	Block a user
	 Daniel Golle
					Daniel Golle