net-next: dsa: move struct dsa_device_ops to the global header file

We need to access this struct from within the flow_dissector to fix
dissection for packets coming in on DSA devices.

Signed-off-by: Muciri Gatimu <muciri@openmesh.com>
Signed-off-by: Shashidhar Lakkavalli <shashidhar.lakkavalli@openmesh.com>
Signed-off-by: John Crispin <john@phrozen.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/dsa.h b/include/net/dsa.h
index a4f66db..65d7804 100644 (file)
--- a/include/net/dsa.h
+++ b/include/net/dsa.h
@@ -101,6 +101,13 @@ struct dsa_platform_data {
 
 struct packet_type;
 
+struct dsa_device_ops {
+       struct sk_buff *(*xmit)(struct sk_buff *skb, struct net_device *dev);
+       struct sk_buff *(*rcv)(struct sk_buff *skb, struct net_device *dev,
+                              struct packet_type *pt,
+                              struct net_device *orig_dev);
+};
+
 struct dsa_switch_tree {
        struct list_head        list;
 

diff --git a/net/dsa/dsa_priv.h b/net/dsa/dsa_priv.h
index 1debf9c..9c3eeb7 100644 (file)
--- a/net/dsa/dsa_priv.h
+++ b/net/dsa/dsa_priv.h
@@ -65,13 +65,6 @@ struct dsa_notifier_vlan_info {
        int port;
 };
 
-struct dsa_device_ops {
-       struct sk_buff *(*xmit)(struct sk_buff *skb, struct net_device *dev);
-       struct sk_buff *(*rcv)(struct sk_buff *skb, struct net_device *dev,
-                              struct packet_type *pt,
-                              struct net_device *orig_dev);
-};
-
 struct dsa_slave_priv {
        /* Copy of dp->ds->dst->tag_ops->xmit for faster access in hot path */
        struct sk_buff *        (*xmit)(struct sk_buff *skb,