On Tue, Aug 18, 2015 at 10:33:13PM +0200, Jiri Benc wrote:
> Signed-off-by: Jiri Benc <jb...@redhat.com>
> ---
> drivers/net/vxlan.c | 6 +++---
> include/net/ip_tunnels.h | 23 +++++++++++++++++++----
> net/core/filter.c | 4 ++--
> net/ipv4/ip_gre.c | 10 +++++-----
> net/ipv4/ip_tunnel_core.c | 8 ++++----
> net/openvswitch/flow_netlink.c | 18 +++++++++---------
> net/openvswitch/flow_table.c | 2 +-
> net/openvswitch/vport-geneve.c | 2 +-
> net/openvswitch/vport.c | 2 +-
> net/openvswitch/vport.h | 4 ++--
> 10 files changed, 47 insertions(+), 32 deletions(-)
please add commit message. +47 -32 cannot be empty.
> +/* Used to memset ipv4 address padding. */
> +#define IP_TUNNEL_KEY_IPV4_PAD offsetofend(struct ip_tunnel_key,
> u.ipv4.dst)
> +#define IP_TUNNEL_KEY_IPV4_PAD_LEN \
> + (FIELD_SIZEOF(struct ip_tunnel_key, u) - IP_TUNNEL_KEY_IPV4_PAD)
> +
> struct ip_tunnel_key {
> __be64 tun_id;
> - __be32 ipv4_src;
> - __be32 ipv4_dst;
> + union {
> + struct {
> + __be32 src;
> + __be32 dst;
> + } ipv4;
> + struct {
> + struct in6_addr src;
> + struct in6_addr dst;
> + } ipv6;
> + } u;
...
> + tun_info->key.u.ipv4.src = saddr;
> + tun_info->key.u.ipv4.dst = daddr;
> + memset((unsigned char *)&tun_info->key + IP_TUNNEL_KEY_IPV4_PAD,
> + 0, IP_TUNNEL_KEY_IPV4_PAD_LEN);
the math looks wrong.
IP_TUNNEL_KEY_IPV4_PAD_LEN = sizeof(u) - offsetofend(u.ipv4.dst)
8 byte mistake?
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
