Merge tag 'drm-intel-fixes-2016-04-07' of git://anongit.freedesktop.org/drm-intel...

[deliverable/linux.git] / include / net / udp.h

diff --git a/include/net/udp.h b/include/net/udp.h
index 2842541e28e715ca12b00eed901e0be2f8741a6c..92927f729ac86495a947d0fc9e2650e5e44ded2b 100644 (file)
--- a/include/net/udp.h
+++ b/include/net/udp.h
@@ -177,9 +177,10 @@ static inline struct udphdr *udp_gro_udphdr(struct sk_buff *skb)
 }
 
 /* hash routines shared between UDPv4/6 and UDP-Litev4/6 */
-static inline void udp_lib_hash(struct sock *sk)
+static inline int udp_lib_hash(struct sock *sk)
 {
        BUG();
+       return 0;
 }
 
 void udp_lib_unhash(struct sock *sk);