diff options
| author |   David S. Miller <davem@davemloft.net> | 2017-05-18 16:11:32 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-05-18 16:11:32 -0400 |
| commit | c6cd850d6568872f66fc4a4582f34f9b910066ca (patch) | |
| tree | e9a6370f7b0ce110e2916a6288a8fb0ee8323e37 /net/core/sock.c | |
| parent | net/mlx5e: Fix possible memory leak (diff) | |
| parent | Merge tag 'md/4.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/shli/md (diff) | |
| download | linux-dev-c6cd850d6568872f66fc4a4582f34f9b910066ca.tar.xz linux-dev-c6cd850d6568872f66fc4a4582f34f9b910066ca.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/core/sock.c')
| -rw-r--r-- | net/core/sock.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/core/sock.c b/net/core/sock.c index 93d011e35b83..bef844127e01 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -139,10 +139,7 @@ #include <trace/events/sock.h> -#ifdef CONFIG_INET #include <net/tcp.h> -#endif - #include <net/busy_poll.h> static DEFINE_MUTEX(proto_list_mutex); |