From: David S. Miller <davem@davemloft.net>
Date: Sat, 11 Feb 2017 07:31:11 +0000 (-0500)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: v4.11-rc1~124^2~144
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=35eeacf1820a08305c2b0960febfa190f5a6dd63;p=linux.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
---

35eeacf1820a08305c2b0960febfa190f5a6dd63
diff --cc include/net/lwtunnel.h
index 45399ed132bf,0388b9c5f5e2..ebfe237aad7e
--- a/include/net/lwtunnel.h
+++ b/include/net/lwtunnel.h
@@@ -178,10 -178,13 +178,13 @@@ static inline int lwtunnel_valid_encap_
  }
  static inline int lwtunnel_valid_encap_type_attr(struct nlattr *attr, int len)
  {
- 	return -EOPNOTSUPP;
+ 	/* return 0 since we are not walking attr looking for
+ 	 * RTA_ENCAP_TYPE attribute on nexthops.
+ 	 */
+ 	return 0;
  }
  
 -static inline int lwtunnel_build_state(struct net_device *dev, u16 encap_type,
 +static inline int lwtunnel_build_state(u16 encap_type,
  				       struct nlattr *encap,
  				       unsigned int family, const void *cfg,
  				       struct lwtunnel_state **lws)