OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6b8847c
)
ip_tunnels: use offsetofend
author
Jiri Benc
<jbenc@redhat.com>
Thu, 20 Aug 2015 11:56:22 +0000
(13:56 +0200)
committer
David S. Miller
<davem@davemloft.net>
Thu, 20 Aug 2015 22:42:36 +0000
(15:42 -0700)
Signed-off-by: Jiri Benc <jbenc@redhat.com>
Acked-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
include/net/ip_tunnels.h
patch
|
blob
|
history
diff --git
a/include/net/ip_tunnels.h
b/include/net/ip_tunnels.h
index
ca173f2
..
cc3b39e
100644
(file)
--- a/
include/net/ip_tunnels.h
+++ b/
include/net/ip_tunnels.h
@@
-23,9
+23,7
@@
#define IPTUNNEL_ERR_TIMEO (30*HZ)
/* Used to memset ip_tunnel padding. */
-#define IP_TUNNEL_KEY_SIZE \
- (offsetof(struct ip_tunnel_key, tp_dst) + \
- FIELD_SIZEOF(struct ip_tunnel_key, tp_dst))
+#define IP_TUNNEL_KEY_SIZE offsetofend(struct ip_tunnel_key, tp_dst)
struct ip_tunnel_key {
__be64 tun_id;