diff options
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/ip6_route.h | 4 | ||||
| -rw-r--r-- | include/net/route.h | 1 | ||||
| -rw-r--r-- | include/net/tls.h | 15 | 
3 files changed, 3 insertions, 17 deletions
| diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h index 4790beaa86e0..ee7405e759ba 100644 --- a/include/net/ip6_route.h +++ b/include/net/ip6_route.h @@ -262,8 +262,8 @@ static inline bool ip6_sk_ignore_df(const struct sock *sk)  	       inet6_sk(sk)->pmtudisc == IPV6_PMTUDISC_OMIT;  } -static inline struct in6_addr *rt6_nexthop(struct rt6_info *rt, -					   struct in6_addr *daddr) +static inline const struct in6_addr *rt6_nexthop(const struct rt6_info *rt, +						 const struct in6_addr *daddr)  {  	if (rt->rt6i_flags & RTF_GATEWAY)  		return &rt->rt6i_gateway; diff --git a/include/net/route.h b/include/net/route.h index 065b47754f05..55ff71ffb796 100644 --- a/include/net/route.h +++ b/include/net/route.h @@ -221,6 +221,7 @@ void ip_rt_get_source(u8 *src, struct sk_buff *skb, struct rtable *rt);  struct rtable *rt_dst_alloc(struct net_device *dev,  			     unsigned int flags, u16 type,  			     bool nopolicy, bool noxfrm, bool will_cache); +struct rtable *rt_dst_clone(struct net_device *dev, struct rtable *rt);  struct in_ifaddr;  void fib_add_ifaddr(struct in_ifaddr *); diff --git a/include/net/tls.h b/include/net/tls.h index 4a55ce6a303f..53d96bca220d 100644 --- a/include/net/tls.h +++ b/include/net/tls.h @@ -373,21 +373,6 @@ static inline bool tls_is_partially_sent_record(struct tls_context *ctx)  	return !!ctx->partially_sent_record;  } -static inline int tls_complete_pending_work(struct sock *sk, -					    struct tls_context *ctx, -					    int flags, long *timeo) -{ -	int rc = 0; - -	if (unlikely(sk->sk_write_pending)) -		rc = wait_on_pending_writer(sk, timeo); - -	if (!rc && tls_is_partially_sent_record(ctx)) -		rc = tls_push_partial_record(sk, ctx, flags); - -	return rc; -} -  static inline bool tls_is_pending_open_record(struct tls_context *tls_ctx)  {  	return tls_ctx->pending_open_record_frags; | 
