diff options
| author | Alexander Duyck <alexander.h.duyck@intel.com> | 2014-09-04 19:32:11 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-09-06 02:43:45 +0200 |
| commit | 82eabd9eb2ec1603282a2c3f74dfcb6fe0aaea0e (patch) | |
| tree | 3f1064b6b501005f741bacc74e9ed370c2ffb996 /include/net/sock.h | |
| parent | net-timestamp: Make the clone operation stand-alone from phy timestamping (diff) | |
| download | linux-82eabd9eb2ec1603282a2c3f74dfcb6fe0aaea0e.tar.xz linux-82eabd9eb2ec1603282a2c3f74dfcb6fe0aaea0e.zip | |
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: Alexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/sock.h')
| -rw-r--r-- | include/net/sock.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index e02be37a3d91..ad23e80cb8d3 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -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); |