aboutsummaryrefslogtreecommitdiff
path: root/net/dsa
diff options
context:
space:
mode:
authorviresh kumar <viresh.kumar@linaro.org>2012-11-23 19:53:54 +0000
committerDavid S. Miller <davem@davemloft.net>2012-11-25 16:11:47 -0500
commit82167cb8c6b2f8166d5c7532e5ef4b5e0cc46a72 (patch)
treead1bec537bfcfc8c7c434e9b564af43a54161a67 /net/dsa
parenta303fbf3dbf2d56a938841d866037967120f6954 (diff)
downloadlinux-stericsson-82167cb8c6b2f8166d5c7532e5ef4b5e0cc46a72.tar.gz
net: dsa/slave: Fix compilation warnings
Currently when none of CONFIG_NET_DSA_TAG_DSA, CONFIG_NET_DSA_TAG_EDSA and CONFIG_NET_DSA_TAG_TRAILER is defined, we get following compilation warnings: net/dsa/slave.c:51:12: warning: 'dsa_slave_init' defined but not used [-Wunused-function] net/dsa/slave.c:60:12: warning: 'dsa_slave_open' defined but not used [-Wunused-function] net/dsa/slave.c:98:12: warning: 'dsa_slave_close' defined but not used [-Wunused-function] net/dsa/slave.c:116:13: warning: 'dsa_slave_change_rx_flags' defined but not used [-Wunused-function] net/dsa/slave.c:127:13: warning: 'dsa_slave_set_rx_mode' defined but not used [-Wunused-function] net/dsa/slave.c:136:12: warning: 'dsa_slave_set_mac_address' defined but not used [-Wunused-function] net/dsa/slave.c:164:12: warning: 'dsa_slave_ioctl' defined but not used [-Wunused-function] Earlier approach to fix this was discussed here: lkml.org/lkml/2012/10/29/549 This is another approach to fix it. This is done by some changes in config options, which make more sense than the earlier approach. As, atleast one tagging option must always be selected for using net/dsa/ infrastructure, this patch selects NET_DSA from tagging configs instead of having it as an selectable config. Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dsa')
-rw-r--r--net/dsa/Kconfig16
1 files changed, 9 insertions, 7 deletions
diff --git a/net/dsa/Kconfig b/net/dsa/Kconfig
index 274791cd7a35..0f5dc344ed92 100644
--- a/net/dsa/Kconfig
+++ b/net/dsa/Kconfig
@@ -1,5 +1,5 @@
config NET_DSA
- tristate "Distributed Switch Architecture support"
+ tristate
default n
depends on EXPERIMENTAL && NETDEVICES && !S390
select PHYLIB
@@ -8,19 +8,21 @@ config NET_DSA
the Distributed Switch Architecture.
-if NET_DSA
+menu "Distributed Switch Architecture support"
# tagging formats
config NET_DSA_TAG_DSA
- bool
+ bool "Original DSA packet tagging format"
+ select NET_DSA
default n
config NET_DSA_TAG_EDSA
- bool
+ bool "Ethertype DSA packet tagging format"
+ select NET_DSA
default n
config NET_DSA_TAG_TRAILER
- bool
+ bool "Trailer DSA packet tagging format"
+ select NET_DSA
default n
-
-endif
+endmenu