aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Lunn <andrew@lunn.ch>2019-04-28 13:37:22 -0400
committerDavid S. Miller <davem@davemloft.net>2019-04-28 19:41:01 -0400
commit3aa475e197f44ae401502b61aa341d3e40aa045a (patch)
tree603ee23156f21fe7366172aa6b3d766b8ba96ea1
parentf81a43e8da07ccd91c4d923a44ffffaeee39dcc8 (diff)
dsa: tag_brcm: Avoid unused symbols
It is possible that the driver is compiled with both CONFIG_NET_DSA_TAG_BRCM and CONFIG_NET_DSA_TAG_BRCM_PREPEND disabled. This results in warnings about unused symbols. Add some conditional compilation to avoid this. Signed-off-by: Andrew Lunn <andrew@lunn.ch> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> v2 Reorder patch to before tag drivers can be modules Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/dsa/tag_brcm.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/net/dsa/tag_brcm.c b/net/dsa/tag_brcm.c
index 9890097a85d9..d52db5f2c721 100644
--- a/net/dsa/tag_brcm.c
+++ b/net/dsa/tag_brcm.c
@@ -55,6 +55,9 @@
55#define BRCM_EG_TC_MASK 0x7 55#define BRCM_EG_TC_MASK 0x7
56#define BRCM_EG_PID_MASK 0x1f 56#define BRCM_EG_PID_MASK 0x1f
57 57
58#if IS_ENABLED(CONFIG_NET_DSA_TAG_BRCM) || \
59 IS_ENABLED(CONFIG_NET_DSA_TAG_BRCM_PREPEND)
60
58static struct sk_buff *brcm_tag_xmit_ll(struct sk_buff *skb, 61static struct sk_buff *brcm_tag_xmit_ll(struct sk_buff *skb,
59 struct net_device *dev, 62 struct net_device *dev,
60 unsigned int offset) 63 unsigned int offset)
@@ -139,8 +142,9 @@ static struct sk_buff *brcm_tag_rcv_ll(struct sk_buff *skb,
139 142
140 return skb; 143 return skb;
141} 144}
145#endif
142 146
143#ifdef CONFIG_NET_DSA_TAG_BRCM 147#if IS_ENABLED(CONFIG_NET_DSA_TAG_BRCM)
144static struct sk_buff *brcm_tag_xmit(struct sk_buff *skb, 148static struct sk_buff *brcm_tag_xmit(struct sk_buff *skb,
145 struct net_device *dev) 149 struct net_device *dev)
146{ 150{
@@ -179,7 +183,7 @@ DSA_TAG_DRIVER(brcm_netdev_ops);
179MODULE_ALIAS_DSA_TAG_DRIVER(DSA_TAG_PROTO_BRCM); 183MODULE_ALIAS_DSA_TAG_DRIVER(DSA_TAG_PROTO_BRCM);
180#endif 184#endif
181 185
182#ifdef CONFIG_NET_DSA_TAG_BRCM_PREPEND 186#if IS_ENABLED(CONFIG_NET_DSA_TAG_BRCM_PREPEND)
183static struct sk_buff *brcm_tag_xmit_prepend(struct sk_buff *skb, 187static struct sk_buff *brcm_tag_xmit_prepend(struct sk_buff *skb,
184 struct net_device *dev) 188 struct net_device *dev)
185{ 189{