summaryrefslogtreecommitdiffstats
path: root/include/net/udplite.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2013-11-14 08:28:30 +0100
committerIngo Molnar <mingo@kernel.org>2013-11-14 08:28:30 +0100
commit555a098af6086256bc64d3806519f37ccae936e0 (patch)
tree4f13126483fc1202d23f1ba55045fac41d19118e /include/net/udplite.h
parentd969135aae1434547f41853f0e8eaa622e8b8816 (diff)
parentf0d55cc1a65852e6647d4f5d707c1c9b5471ce3c (diff)
Merge branch 'linus' into perf/urgent
Merge dependencies to apply a fix. Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/net/udplite.h')
-rw-r--r--include/net/udplite.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/net/udplite.h b/include/net/udplite.h
index 71375459a88..2caadabcd07 100644
--- a/include/net/udplite.h
+++ b/include/net/udplite.h
@@ -126,7 +126,7 @@ static inline __wsum udplite_csum(struct sk_buff *skb)
return skb_checksum(skb, off, len, 0);
}
-extern void udplite4_register(void);
-extern int udplite_get_port(struct sock *sk, unsigned short snum,
- int (*scmp)(const struct sock *, const struct sock *));
+void udplite4_register(void);
+int udplite_get_port(struct sock *sk, unsigned short snum,
+ int (*scmp)(const struct sock *, const struct sock *));
#endif /* _UDPLITE_H */