1 files changed, 4 insertions, 33 deletions

diff --git a/include/linux/if_macvlan.h b/include/linux/if_macvlan.h
index 84ba5ac39e03..7c8b20b120ea 100644
--- a/include/linux/if_macvlan.h
+++ b/include/linux/if_macvlan.h
@@ -2,6 +2,7 @@
 #define _LINUX_IF_MACVLAN_H
 
 #include <linux/if_link.h>
+#include <linux/if_vlan.h>
 #include <linux/list.h>
 #include <linux/netdevice.h>
 #include <linux/netlink.h>
@@ -24,28 +25,6 @@ static inline struct socket *macvtap_get_socket(struct file *f)
 struct macvlan_port;
 struct macvtap_queue;
 
-/**
- *      struct macvlan_pcpu_stats - MACVLAN percpu stats
- *      @rx_packets: number of received packets
- *      @rx_bytes: number of received bytes
- *      @rx_multicast: number of received multicast packets
- *      @tx_packets: number of transmitted packets
- *      @tx_bytes: number of transmitted bytes
- *      @syncp: synchronization point for 64bit counters
- *      @rx_errors: number of rx errors
- *      @tx_dropped: number of tx dropped packets
- */
-struct macvlan_pcpu_stats {
-        u64                     rx_packets;
-        u64                     rx_bytes;
-        u64                     rx_multicast;
-        u64                     tx_packets;
-        u64                     tx_bytes;
-        struct u64_stats_sync   syncp;
-        u32                     rx_errors;
-        u32                     tx_dropped;
-};
-
 /*
  * Maximum times a macvtap device can be opened. This can be used to
  * configure the number of receive queue, e.g. for multiqueue virtio.
@@ -62,15 +41,13 @@ struct macvlan_dev {
         struct macvlan_port     *port;
         struct net_device       *lowerdev;
         void                    *fwd_priv;
-        struct macvlan_pcpu_stats __percpu *pcpu_stats;
+        struct vlan_pcpu_stats __percpu *pcpu_stats;
 
         DECLARE_BITMAP(mc_filter, MACVLAN_MC_FILTER_SZ);
 
         netdev_features_t       set_features;
         enum macvlan_mode       mode;
         u16                     flags;
-        int (*receive)(struct sk_buff *skb);
-        int (*forward)(struct net_device *dev, struct sk_buff *skb);
         /* This array tracks active taps. */
         struct macvtap_queue    __rcu *taps[MAX_MACVTAP_QUEUES];
         /* This list tracks all taps (both enabled and disabled) */
@@ -86,7 +63,7 @@ static inline void macvlan_count_rx(const struct macvlan_dev *vlan,
                                     bool multicast)
 {
         if (likely(success)) {
-                struct macvlan_pcpu_stats *pcpu_stats;
+                struct vlan_pcpu_stats *pcpu_stats;
 
                 pcpu_stats = this_cpu_ptr(vlan->pcpu_stats);
                 u64_stats_update_begin(&pcpu_stats->syncp);
@@ -103,10 +80,7 @@ static inline void macvlan_count_rx(const struct macvlan_dev *vlan,
 extern void macvlan_common_setup(struct net_device *dev);
 
 extern int macvlan_common_newlink(struct net *src_net, struct net_device *dev,
-                                  struct nlattr *tb[], struct nlattr *data[],
-                                  int (*receive)(struct sk_buff *skb),
-                                  int (*forward)(struct net_device *dev,
-                                                 struct sk_buff *skb));
+                                  struct nlattr *tb[], struct nlattr *data[]);
 
 extern void macvlan_count_rx(const struct macvlan_dev *vlan,
                              unsigned int len, bool success,
@@ -116,9 +90,6 @@ extern void macvlan_dellink(struct net_device *dev, struct list_head *head);
 
 extern int macvlan_link_register(struct rtnl_link_ops *ops);
 
-extern netdev_tx_t macvlan_start_xmit(struct sk_buff *skb,
-                                      struct net_device *dev);
-
 #if IS_ENABLED(CONFIG_MACVLAN)
 static inline struct net_device *
 macvlan_dev_real_dev(const struct net_device *dev)