[PATCH net-next 1/7] net: dsa: hide dsa_uses_tagged_protocol code
From: Vivien Didelot <hidden>
Date: 2017-05-30 14:25:30
Also in:
lkml
Subsystem:
networking [dsa], networking [general], the rest · Maintainers:
Andrew Lunn, Vladimir Oltean, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
Hide the implementation of dsa_uses_tagged_protocol in dsa.c since this
helper will be extended to access the opaque dsa_device_ops structure.
At the same time, fix the checkpatch comparison check:
CHECK: Comparison to NULL could be written "dst->rcv"
#41: FILE: net/dsa/dsa.c:32:
+ return dst->rcv != NULL;
Signed-off-by: Vivien Didelot <redacted>
---
include/net/dsa.h | 5 +----
net/dsa/dsa.c | 5 +++++
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/include/net/dsa.h b/include/net/dsa.h
index c0e567c0c824..cb5d668b265d 100644
--- a/include/net/dsa.h
+++ b/include/net/dsa.h@@ -464,10 +464,7 @@ struct mii_bus *dsa_host_dev_to_mii_bus(struct device *dev); struct net_device *dsa_dev_to_net_device(struct device *dev); -static inline bool dsa_uses_tagged_protocol(struct dsa_switch_tree *dst) -{ - return dst->rcv != NULL; -} +bool dsa_uses_tagged_protocol(struct dsa_switch_tree *dst); static inline bool netdev_uses_dsa(struct net_device *dev) {
diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c
index 3288a80d4d6c..7a8a0358299b 100644
--- a/net/dsa/dsa.c
+++ b/net/dsa/dsa.c@@ -27,6 +27,11 @@ #include "dsa_priv.h" +bool dsa_uses_tagged_protocol(struct dsa_switch_tree *dst) +{ + return !!dst->rcv; +} + static struct sk_buff *dsa_slave_notag_xmit(struct sk_buff *skb, struct net_device *dev) {
--
2.13.0