projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4d054f2
)
net: Fix build failures due to ip_is_fragment()
author
David S. Miller
<
[email protected]
>
Fri, 24 Jun 2011 04:28:52 +0000
(21:28 -0700)
committer
David S. Miller
<
[email protected]
>
Fri, 24 Jun 2011 04:28:52 +0000
(21:28 -0700)
It needs to be available even when CONFIG_INET is not set.
Reported-by: Stephen Rothwell <
[email protected]
>
Reported-by: Randy Dunlap <
[email protected]
>
Signed-off-by: David S. Miller <
[email protected]
>
include/net/ip.h
patch
|
blob
|
history
diff --git
a/include/net/ip.h
b/include/net/ip.h
index d603cd329c4e55094d796c3e2bc2132daa4228ad..9fa9416d14d7e8cd845044776a1985f5e5975a7d 100644
(file)
--- a/
include/net/ip.h
+++ b/
include/net/ip.h
@@
-236,6
+236,11
@@
extern void ipfrag_init(void);
extern void ip_static_sysctl_init(void);
+static inline bool ip_is_fragment(const struct iphdr *iph)
+{
+ return (iph->frag_off & htons(IP_MF | IP_OFFSET)) != 0;
+}
+
#ifdef CONFIG_INET
#include <net/dst.h>
@@
-250,11
+255,6
@@
int ip_decrease_ttl(struct iphdr *iph)
return --iph->ttl;
}
-static inline bool ip_is_fragment(const struct iphdr *iph)
-{
- return (iph->frag_off & htons(IP_MF | IP_OFFSET)) != 0;
-}
-
static inline
int ip_dont_fragment(struct sock *sk, struct dst_entry *dst)
{