Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 705cc62f authored by Jiri Benc's avatar Jiri Benc Committed by David S. Miller
Browse files

vxlan: provide access function for vxlan socket address family 



Signed-off-by: default avatarJiri Benc <jbenc@redhat.com>
Acked-by: default avatarThomas Graf <tgraf@suug.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ab450605

drivers/net/vxlan.c

+4 −4
Original line number Diff line number Diff line
@@ -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);

		}

include/net/vxlan.h

+5 −0
Original line number Diff line number Diff line
@@ -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;

}