diff options
| author | David S. Miller <davem@davemloft.net> | 2018-02-14 11:55:39 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-02-14 11:55:39 -0500 |
| commit | 1d631583ae5e40681dc9a41d7cfa845222c3c7ff (patch) | |
| tree | 1480abf507a78bdb5989340d061e8fb7b593f5d7 /net | |
| parent | 77079683617b60387ad23e91cc5b82693b3075ab (diff) | |
| parent | e92bad5034922776bd5e64e3db739d7607eb7e29 (diff) | |
| download | linux-1d631583ae5e40681dc9a41d7cfa845222c3c7ff.tar.bz2 | |
Merge branch 'net-dev-Make-protocol-ptr-dependent-on-CONFIG'
David Ahern says:
====================
net: dev: Make protocol ptr dependent on CONFIG
Found these in a branch from 3-years ago. Still relevant today.
Make decnet, ax25, and atalk ptrs in net_device based on their
respective CONFIG.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/dev.c | 3 | ||||
| -rw-r--r-- | net/socket.c | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index df5241c8eda1..4bd4ad7ffda4 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -8134,8 +8134,9 @@ void netdev_run_todo(void) BUG_ON(!list_empty(&dev->ptype_specific)); WARN_ON(rcu_access_pointer(dev->ip_ptr)); WARN_ON(rcu_access_pointer(dev->ip6_ptr)); +#if IS_ENABLED(CONFIG_DECNET) WARN_ON(dev->dn_ptr); - +#endif if (dev->priv_destructor) dev->priv_destructor(dev); if (dev->needs_free_netdev) diff --git a/net/socket.c b/net/socket.c index fac8246a8ae8..d83e804d5e65 100644 --- a/net/socket.c +++ b/net/socket.c @@ -104,7 +104,6 @@ #include <linux/ipv6_route.h> #include <linux/route.h> #include <linux/sockios.h> -#include <linux/atalk.h> #include <net/busy_poll.h> #include <linux/errqueue.h> |