> On Aug 18, 2015, at 1:33 PM, Jiri Benc <jb...@redhat.com> wrote: > > Signed-off-by: Jiri Benc <jb...@redhat.com> > --- > drivers/net/vxlan.c | 8 ++++---- > include/net/vxlan.h | 5 +++++ > 2 files changed, 9 insertions(+), 4 deletions(-) > > diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c > index e4b8ab63d0fa..d5ca1d7e0b81 100644 > --- a/drivers/net/vxlan.c > +++ b/drivers/net/vxlan.c > @@ -236,7 +236,7 @@ static struct vxlan_sock *vxlan_find_sock(struct net > *net, sa_family_t family, > > hlist_for_each_entry_rcu(vs, vs_head(net, port), hlist) { > if (inet_sk(vs->sock->sk)->inet_sport == port && > - inet_sk(vs->sock->sk)->sk.sk_family == family && > + vxlan_get_sk_family(vs) == family && > vs->flags == flags) > return vs; > } > @@ -625,7 +625,7 @@ static void vxlan_notify_add_rx_port(struct vxlan_sock > *vs) > struct net_device *dev; > struct sock *sk = vs->sock->sk; > struct net *net = sock_net(sk); > - sa_family_t sa_family = sk->sk_family; > + sa_family_t sa_family = vxlan_get_sk_family(vs); > __be16 port = inet_sk(sk)->inet_sport; > int err; > > @@ -650,7 +650,7 @@ static void vxlan_notify_del_rx_port(struct vxlan_sock > *vs) > struct net_device *dev; > struct sock *sk = vs->sock->sk; > struct net *net = sock_net(sk); > - sa_family_t sa_family = sk->sk_family; > + sa_family_t sa_family = vxlan_get_sk_family(vs); > __be16 port = inet_sk(sk)->inet_sport; > > rcu_read_lock(); > @@ -2390,7 +2390,7 @@ void vxlan_get_rx_port(struct net_device *dev) > for (i = 0; i < PORT_HASH_SIZE; ++i) { > hlist_for_each_entry_rcu(vs, &vn->sock_list[i], hlist) { > port = inet_sk(vs->sock->sk)->inet_sport; > - sa_family = vs->sock->sk->sk_family; > + sa_family = vxlan_get_sk_family(vs); > dev->netdev_ops->ndo_add_vxlan_port(dev, sa_family, > port); > } > diff --git a/include/net/vxlan.h b/include/net/vxlan.h > index e4534f1b2d8c..43677e6b9c43 100644 > --- a/include/net/vxlan.h > +++ b/include/net/vxlan.h > @@ -241,3 +241,8 @@ static inline void vxlan_get_rx_port(struct net_device > *netdev) > } > #endif > #endif > + > +static inline unsigned short vxlan_get_sk_family(struct vxlan_sock *vs) > +{ > + return vs->sock->sk->sk_family; > +}
This causes build problems because vxlan_get_sk_family is not inside the #endif protecting the file for multiple inclusion. Please put vxlan_get_sk_family inside the last #endif. -- Mark Rustad, Networking Division, Intel Corporation
signature.asc
Description: Message signed with OpenPGP using GPGMail