commit: http://blackfin.uclinux.org/git/?p=linux-kernel;a=commitdiff;h=cf7ead738ab22e0c840c90e0aded53453790803f branch: http://blackfin.uclinux.org/git/?p=linux-kernel;a=shortlog;h=refs/heads/trunk
eth_type_trans() will use these functions if DSA is enabled, which blocks building DSA as a module. Signed-off-by: Ben Hutchings <[email protected]> Signed-off-by: David S. Miller <[email protected]> Signed-off-by: Bob Liu <[email protected]> --- include/net/dsa.h | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++-- net/dsa/dsa.c | 30 ---------------------------- 2 files changed, 52 insertions(+), 33 deletions(-) diff --git a/include/net/dsa.h b/include/net/dsa.h index a80920c..0a4b0ed 100644 --- a/include/net/dsa.h +++ b/include/net/dsa.h @@ -16,6 +16,9 @@ #include <linux/timer.h> #include <linux/workqueue.h> +#include <linux/timer.h> +#include <linux/workqueue.h> + #define DSA_MAX_SWITCHES 4 #define DSA_MAX_PORTS 12 @@ -59,8 +62,54 @@ struct dsa_platform_data { struct dsa_chip_data *chip; }; -extern bool dsa_uses_dsa_tags(void *dsa_ptr); -extern bool dsa_uses_trailer_tags(void *dsa_ptr); -extern bool dsa_uses_stpid_tags(void *dsa_ptr); +struct dsa_switch_tree { + /* + * Configuration data for the platform device that owns + * this dsa switch tree instance. + */ + struct dsa_platform_data *pd; + + /* + * Reference to network device to use, and which tagging + * protocol to use. + */ + struct net_device *master_netdev; + __be16 tag_protocol; + + /* + * The switch and port to which the CPU is attached. + */ + s8 cpu_switch; + s8 cpu_port; + + /* + * Link state polling. + */ + int link_poll_needed; + struct work_struct link_poll_work; + struct timer_list link_poll_timer; + + /* + * Data for the individual switch chips. + */ + struct dsa_switch *ds[DSA_MAX_SWITCHES]; +}; + +/* + * The original DSA tag format and some other tag formats have no + * ethertype, which means that we need to add a little hack to the + * networking receive path to make sure that received frames get + * the right ->protocol assigned to them when one of those tag + * formats is in use. + */ +static inline bool dsa_uses_dsa_tags(struct dsa_switch_tree *dst) +{ + return !!(dst->tag_protocol == htons(ETH_P_DSA)); +} + +static inline bool dsa_uses_trailer_tags(struct dsa_switch_tree *dst) +{ + return !!(dst->tag_protocol == htons(ETH_P_TRAILER)); +} #endif diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c index 516d9d8..04812f3 100644 --- a/net/dsa/dsa.c +++ b/net/dsa/dsa.c @@ -200,36 +200,6 @@ static void dsa_switch_destroy(struct dsa_switch *ds) { } - -/* hooks for ethertype-less tagging formats *********************************/ -/* - * The original DSA tag format and some other tag formats have no - * ethertype, which means that we need to add a little hack to the - * networking receive path to make sure that received frames get - * the right ->protocol assigned to them when one of those tag - * formats is in use. - */ -bool dsa_uses_dsa_tags(void *dsa_ptr) -{ - struct dsa_switch_tree *dst = dsa_ptr; - - return !!(dst->tag_protocol == htons(ETH_P_DSA)); -} - -bool dsa_uses_trailer_tags(void *dsa_ptr) -{ - struct dsa_switch_tree *dst = dsa_ptr; - - return !!(dst->tag_protocol == htons(ETH_P_TRAILER)); -} - -bool dsa_uses_stpid_tags(void *dsa_ptr) -{ - struct dsa_switch_tree *dst = dsa_ptr; - - return !!(dst->tag_protocol == htons(ETH_P_STPID)); -} - /* link polling *************************************************************/ static void dsa_link_poll_work(struct work_struct *ugly) {
_______________________________________________ Linux-kernel-commits mailing list [email protected] https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
