leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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: Alexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Alexander Duyck 2014-09-04 13:32:11 -04:00 committed by David S. Miller
parent 62bccb8cdb
commit 82eabd9eb2
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/net/sock.h
View File

@ -1575,7 +1575,11 @@ void sock_wfree(struct sk_buff *skb);
void skb_orphan_partial(struct sk_buff *skb); void skb_orphan_partial(struct sk_buff *skb);
void sock_rfree(struct sk_buff *skb); void sock_rfree(struct sk_buff *skb);
void sock_efree(struct sk_buff *skb); void sock_efree(struct sk_buff *skb);
#ifdef CONFIG_INET
void sock_edemux(struct sk_buff *skb); 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, int sock_setsockopt(struct socket *sock, int level, int op,
char __user *optval, unsigned int optlen); char __user *optval, unsigned int optlen);

4
net/core/sock.c
View File

@ -1643,18 +1643,18 @@ void sock_efree(struct sk_buff *skb)
} }
EXPORT_SYMBOL(sock_efree); EXPORT_SYMBOL(sock_efree);
#ifdef CONFIG_INET
void sock_edemux(struct sk_buff *skb) void sock_edemux(struct sk_buff *skb)
{ {
struct sock *sk = skb->sk; struct sock *sk = skb->sk;
#ifdef CONFIG_INET
if (sk->sk_state == TCP_TIME_WAIT) if (sk->sk_state == TCP_TIME_WAIT)
inet_twsk_put(inet_twsk(sk)); inet_twsk_put(inet_twsk(sk));
else else
#endif
sock_put(sk); sock_put(sk);
} }
EXPORT_SYMBOL(sock_edemux); EXPORT_SYMBOL(sock_edemux);
#endif
kuid_t sock_i_uid(struct sock *sk) kuid_t sock_i_uid(struct sock *sk)
{ {

2
net/ipv4/udp.c
View File

@ -1972,7 +1972,7 @@ void udp_v4_early_demux(struct sk_buff *skb)
return; return;
skb->sk = sk; skb->sk = sk;
skb->destructor = sock_edemux; skb->destructor = sock_efree;
dst = sk->sk_rx_dst; dst = sk->sk_rx_dst;
if (dst) if (dst)