From: David Ahern <dsahern@gmail.com>
To: netdev@vger.kernel.org
Cc: David Ahern <dsa@cumulusnetworks.com>
Subject: [PATCH net-next 3/4] net: Make atalk_ptr depend on ATALK or IRDA
Date: Tue, 13 Feb 2018 08:52:02 -0800 [thread overview]
Message-ID: <20180213165203.1998-4-dsahern@gmail.com> (raw)
In-Reply-To: <20180213165203.1998-1-dsahern@gmail.com>
From: David Ahern <dsa@cumulusnetworks.com>
Signed-off-by: David Ahern <dsa@cumulusnetworks.com>
---
include/linux/atalk.h | 2 ++
include/linux/netdevice.h | 2 ++
2 files changed, 4 insertions(+)
diff --git a/include/linux/atalk.h b/include/linux/atalk.h
index 4d356e168692..40373920ea58 100644
--- a/include/linux/atalk.h
+++ b/include/linux/atalk.h
@@ -113,10 +113,12 @@ extern void aarp_proto_init(void);
/* Inter module exports */
/* Give a device find its atif control structure */
+#if IS_ENABLED(CONFIG_IRDA) || IS_ENABLED(CONFIG_ATALK)
static inline struct atalk_iface *atalk_find_dev(struct net_device *dev)
{
return dev->atalk_ptr;
}
+#endif
extern struct atalk_addr *atalk_find_dev_addr(struct net_device *dev);
extern struct net_device *atrtr_get_dev(struct atalk_addr *sa);
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 8e2e86c851f4..cc39f49cc95c 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -1798,7 +1798,9 @@ struct net_device {
#if IS_ENABLED(CONFIG_TIPC)
struct tipc_bearer __rcu *tipc_ptr;
#endif
+#if IS_ENABLED(CONFIG_IRDA) || IS_ENABLED(CONFIG_ATALK)
void *atalk_ptr;
+#endif
struct in_device __rcu *ip_ptr;
#if IS_ENABLED(CONFIG_DECNET)
struct dn_dev __rcu *dn_ptr;
--
2.11.0
next prev parent reply other threads:[~2018-02-13 16:52 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-13 16:51 [PATCH net-next 0/4] net: dev: Make protocol ptr dependent on CONFIG David Ahern
2018-02-13 16:52 ` [PATCH net-next 1/4] net: Make dn_ptr depend on CONFIG_DECNET David Ahern
2018-02-13 16:52 ` [PATCH net-next 2/4] net: Make ax25_ptr depend on CONFIG_AX25 David Ahern
2018-02-13 16:52 ` David Ahern [this message]
2018-02-13 16:52 ` [PATCH net-next 4/4] net: Remove atalk header from socket.c David Ahern
2018-02-13 19:56 ` [PATCH net-next 0/4] net: dev: Make protocol ptr dependent on CONFIG David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180213165203.1998-4-dsahern@gmail.com \
--to=dsahern@gmail.com \
--cc=dsa@cumulusnetworks.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).