diff --git a/[refs] b/[refs] index 6c13b0173c20..35c3c4a6ab5c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ad542ced254f1c8560260e209f0f0d69dbae49e4 +refs/heads/master: e23ebf0fa9e1548c94d8277e393be97ba48faa06 diff --git a/trunk/include/net/ip_vs.h b/trunk/include/net/ip_vs.h index a6b8b47e41af..05b08c926ade 100644 --- a/trunk/include/net/ip_vs.h +++ b/trunk/include/net/ip_vs.h @@ -1396,7 +1396,7 @@ static inline void ip_vs_update_conntrack(struct sk_buff *skb, { } -static inline int ip_vs_confirm_conntrack(struct sk_buff *skb); +static inline int ip_vs_confirm_conntrack(struct sk_buff *skb) { return NF_ACCEPT; }