net: merge cases where sock_efree and sock_edemux are the same function
authorAlexander Duyck <alexander.h.duyck@intel.com>
Thu, 4 Sep 2014 17:32:11 +0000 (13:32 -0400)
committerDavid S. Miller <davem@davemloft.net>
Sat, 6 Sep 2014 00:43:45 +0000 (17:43 -0700)
commit82eabd9eb2ec1603282a2c3f74dfcb6fe0aaea0e
tree3f1064b6b501005f741bacc74e9ed370c2ffb996
parent62bccb8cdb69051b95a55ab0c489e3cab261c8ef
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>
include/net/sock.h
net/core/sock.c
net/ipv4/udp.c