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

Commit 82eabd9e authored by Alexander Duyck's avatar Alexander Duyck Committed by David S. Miller
Browse files

net: merge cases where sock_efree and sock_edemux are the same function 



Since sock_efree and sock_demux are essentially the same code for non-TCP
sockets and the case where CONFIG_INET is not defined we can combine the
code or replace the call to sock_edemux in several spots.  As a result we
can avoid a bit of unnecessary code or code duplication.

Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 62bccb8c

include/net/sock.h

+4 −0
Original line number Diff line number Diff line
@@ -1575,7 +1575,11 @@ void sock_wfree(struct sk_buff *skb); 
void skb_orphan_partial(struct sk_buff *skb);

void sock_rfree(struct sk_buff *skb);

void sock_efree(struct sk_buff *skb);

#ifdef CONFIG_INET

void sock_edemux(struct sk_buff *skb);

#else

#define sock_edemux(skb) sock_efree(skb)

#endif



int sock_setsockopt(struct socket *sock, int level, int op,

		    char __user *optval, unsigned int optlen);

net/core/sock.c

+2 −2
Original line number Diff line number Diff line
@@ -1643,18 +1643,18 @@ void sock_efree(struct sk_buff *skb) 
}

EXPORT_SYMBOL(sock_efree);



#ifdef CONFIG_INET

void sock_edemux(struct sk_buff *skb)

{

	struct sock *sk = skb->sk;



#ifdef CONFIG_INET

	if (sk->sk_state == TCP_TIME_WAIT)

		inet_twsk_put(inet_twsk(sk));

	else

#endif

		sock_put(sk);

}

EXPORT_SYMBOL(sock_edemux);

#endif



kuid_t sock_i_uid(struct sock *sk)

{

net/ipv4/udp.c

+1 −1
Original line number Diff line number Diff line
@@ -1972,7 +1972,7 @@ void udp_v4_early_demux(struct sk_buff *skb) 
		return;



	skb->sk = sk;

	skb->destructor = sock_edemux;

	skb->destructor = sock_efree;

	dst = sk->sk_rx_dst;



	if (dst)