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:
479b1a5
)
ip_tunnel: Protect tunnel functions with CONFIG_INET guard.
author
Jesse Gross
<
[email protected]
>
Fri, 21 Jun 2013 23:17:11 +0000
(16:17 -0700)
committer
David S. Miller
<
[email protected]
>
Mon, 24 Jun 2013 07:18:38 +0000
(
00:18
-0700)
Tunnel constants can be used in generic code but in these cases
the inline functions in ip_tunnels.h cause compilation problems
if CONFIG_INET is not set.
CC: Pravin Shelar <
[email protected]
>
Reported-by: Randy Dunlap <
[email protected]
>
Signed-off-by: Jesse Gross <
[email protected]
>
Acked-by: Randy Dunlap <
[email protected]
>
Signed-off-by: David S. Miller <
[email protected]
>
include/net/ip_tunnels.h
patch
|
blob
|
history
diff --git
a/include/net/ip_tunnels.h
b/include/net/ip_tunnels.h
index 10bbb4273f7da4db28d65e14241d23de53d7070b..b0d982471a5c299943497dd45b4eda4932ce084a 100644
(file)
--- a/
include/net/ip_tunnels.h
+++ b/
include/net/ip_tunnels.h
@@
-93,6
+93,8
@@
struct ip_tunnel_net {
struct net_device *fb_tunnel_dev;
};
+#ifdef CONFIG_INET
+
int ip_tunnel_init(struct net_device *dev);
void ip_tunnel_uninit(struct net_device *dev);
void ip_tunnel_dellink(struct net_device *dev, struct list_head *head);
@@
-180,4
+182,7
@@
static inline void iptunnel_xmit_stats(int err,
err_stats->tx_dropped++;
}
}
+
+#endif /* CONFIG_INET */
+
#endif /* __NET_IP_TUNNELS_H */