aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuis R. Rodriguez <mcgrof@suse.com>2014-04-22 12:03:58 -0700
committerDavid S. Miller <davem@davemloft.net>2014-04-24 12:36:00 -0400
commit7e65eac8e36f3f4e2553e83249e3d9bdf055456d (patch)
tree8d1f31ab522de1248b6621914dbcfbd93002671f
parentMerge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next (diff)
downloadlinux-dev-7e65eac8e36f3f4e2553e83249e3d9bdf055456d.tar.xz
linux-dev-7e65eac8e36f3f4e2553e83249e3d9bdf055456d.zip
6lowpan: nuke net_ieee802154_lowpan() accessor when 6lowpan is disabled
Johannes noted this is not needed, all of the fragment accessors don't need CONFIG_NET_NS. This goes test compiled with CONFIG_BT_6LOWPAN=y and a disabled CONFIG_NET_NS. CC: Alexander Smirnov <alex.bluesman.smirnov@gmail.com> Cc: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Cc: linux-zigbee-devel@lists.sourceforge.net Cc: David S. Miller" <davem@davemloft.net> Cc: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org Cc: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: Luis R. Rodriguez <mcgrof@suse.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--include/net/net_namespace.h7
1 files changed, 0 insertions, 7 deletions
diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
index bc4118ede5b5..361d26077196 100644
--- a/include/net/net_namespace.h
+++ b/include/net/net_namespace.h
@@ -379,15 +379,8 @@ net_ieee802154_lowpan(struct net *net)
{
return &net->ieee802154_lowpan;
}
-#else
-static inline struct netns_ieee802154_lowpan *
-net_ieee802154_lowpan(struct net *net)
-{
- return NULL;
-}
#endif
-
/* For callers who don't really care about whether it's IPv4 or IPv6 */
static inline void rt_genid_bump_all(struct net *net)
{