1f068588ef
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>
46 lines
1.4 KiB
Diff
46 lines
1.4 KiB
Diff
From b58bf0220f666705e63fe8d361f37c913aee2d8f Mon Sep 17 00:00:00 2001
|
|
From: John Crispin <john@phrozen.org>
|
|
Date: Fri, 21 Jul 2017 09:32:54 +0200
|
|
Subject: [PATCH 38/57] 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: John Crispin <john@phrozen.org>
|
|
---
|
|
include/net/dsa.h | 7 +++++++
|
|
net/dsa/dsa_priv.h | 6 ------
|
|
2 files changed, 7 insertions(+), 6 deletions(-)
|
|
|
|
--- a/include/net/dsa.h
|
|
+++ b/include/net/dsa.h
|
|
@@ -88,6 +88,13 @@ struct dsa_platform_data {
|
|
|
|
struct packet_type;
|
|
|
|
+struct dsa_device_ops {
|
|
+ struct sk_buff *(*xmit)(struct sk_buff *skb, struct net_device *dev);
|
|
+ int 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;
|
|
|
|
--- a/net/dsa/dsa_priv.h
|
|
+++ b/net/dsa/dsa_priv.h
|
|
@@ -15,12 +15,6 @@
|
|
#include <linux/netdevice.h>
|
|
#include <linux/netpoll.h>
|
|
|
|
-struct dsa_device_ops {
|
|
- struct sk_buff *(*xmit)(struct sk_buff *skb, struct net_device *dev);
|
|
- int (*rcv)(struct sk_buff *skb, struct net_device *dev,
|
|
- struct packet_type *pt, struct net_device *orig_dev);
|
|
-};
|
|
-
|
|
struct dsa_slave_priv {
|
|
struct sk_buff * (*xmit)(struct sk_buff *skb,
|
|
struct net_device *dev);
|