diff --git a/[refs] b/[refs] index 7a046506b162..7f60a9097978 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ff4cc3ac93e1d0369928fd60ec1fe82417afc576 +refs/heads/master: 732db659b83579b922c18dee9123e1529b5fb5d2 diff --git a/trunk/include/net/ip_vs.h b/trunk/include/net/ip_vs.h index 7a3c43711a17..e426641c519f 100644 --- a/trunk/include/net/ip_vs.h +++ b/trunk/include/net/ip_vs.h @@ -958,7 +958,7 @@ static __inline__ int ip_vs_todrop(void) */ #define IP_VS_FWD_METHOD(cp) (cp->flags & IP_VS_CONN_F_FWD_MASK) -extern __inline__ char ip_vs_fwd_tag(struct ip_vs_conn *cp) +static inline char ip_vs_fwd_tag(struct ip_vs_conn *cp) { char fwd;