4 files changed, 39 insertions, 1 deletions

diff --git a/include/linux/if_macvlan.h b/include/linux/if_macvlan.h
index ddd33fd5904d..c2702856295e 100644
--- a/include/linux/if_macvlan.h
+++ b/include/linux/if_macvlan.h
@@ -61,6 +61,7 @@ struct macvlan_dev {
         struct hlist_node       hlist;
         struct macvlan_port     *port;
         struct net_device       *lowerdev;
+        void                    *fwd_priv;
         struct macvlan_pcpu_stats __percpu *pcpu_stats;
 
         DECLARE_BITMAP(mc_filter, MACVLAN_MC_FILTER_SZ);
diff --git a/include/linux/netdev_features.h b/include/linux/netdev_features.h
index b05a4b501ab5..1005ebf17575 100644
--- a/include/linux/netdev_features.h
+++ b/include/linux/netdev_features.h
@@ -62,6 +62,7 @@ enum {
         NETIF_F_HW_VLAN_STAG_TX_BIT,    /* Transmit VLAN STAG HW acceleration */
         NETIF_F_HW_VLAN_STAG_RX_BIT,    /* Receive VLAN STAG HW acceleration */
         NETIF_F_HW_VLAN_STAG_FILTER_BIT,/* Receive filtering on VLAN STAGs */
+        NETIF_F_HW_L2FW_DOFFLOAD_BIT,   /* Allow L2 Forwarding in Hardware */
 
         /*
          * Add your fresh new feature above and remember to update
@@ -116,6 +117,7 @@ enum {
 #define NETIF_F_HW_VLAN_STAG_FILTER __NETIF_F(HW_VLAN_STAG_FILTER)
 #define NETIF_F_HW_VLAN_STAG_RX __NETIF_F(HW_VLAN_STAG_RX)
 #define NETIF_F_HW_VLAN_STAG_TX __NETIF_F(HW_VLAN_STAG_TX)
+#define NETIF_F_HW_L2FW_DOFFLOAD        __NETIF_F(HW_L2FW_DOFFLOAD)
 
 /* Features valid for ethtool to change */
 /* = all defined minus driver/device-class-related */
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index b6f6efbcfc74..15fa01c9a3bf 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -962,6 +962,25 @@ struct netdev_phys_port_id {
  *      Called by vxlan to notify the driver about a UDP port and socket
  *      address family that vxlan is not listening to anymore. The operation
  *      is protected by the vxlan_net->sock_lock.
+ *
+ * void* (*ndo_dfwd_add_station)(struct net_device *pdev,
+ *                               struct net_device *dev)
+ *      Called by upper layer devices to accelerate switching or other
+ *      station functionality into hardware. 'pdev is the lowerdev
+ *      to use for the offload and 'dev' is the net device that will
+ *      back the offload. Returns a pointer to the private structure
+ *      the upper layer will maintain.
+ * void (*ndo_dfwd_del_station)(struct net_device *pdev, void *priv)
+ *      Called by upper layer device to delete the station created
+ *      by 'ndo_dfwd_add_station'. 'pdev' is the net device backing
+ *      the station and priv is the structure returned by the add
+ *      operation.
+ * netdev_tx_t (*ndo_dfwd_start_xmit)(struct sk_buff *skb,
+ *                                    struct net_device *dev,
+ *                                    void *priv);
+ *      Callback to use for xmit over the accelerated station. This
+ *      is used in place of ndo_start_xmit on accelerated net
+ *      devices.
  */
 struct net_device_ops {
         int                     (*ndo_init)(struct net_device *dev);
@@ -1098,6 +1117,15 @@ struct net_device_ops {
         void                    (*ndo_del_vxlan_port)(struct  net_device *dev,
                                                       sa_family_t sa_family,
                                                       __be16 port);
+
+        void*                   (*ndo_dfwd_add_station)(struct net_device *pdev,
+                                                        struct net_device *dev);
+        void                    (*ndo_dfwd_del_station)(struct net_device *pdev,
+                                                        void *priv);
+
+        netdev_tx_t             (*ndo_dfwd_start_xmit) (struct sk_buff *skb,
+                                                        struct net_device *dev,
+                                                        void *priv);
 };
 
 /*
@@ -1195,6 +1223,7 @@ struct net_device {
         /* Management operations */
         const struct net_device_ops *netdev_ops;
         const struct ethtool_ops *ethtool_ops;
+        const struct forwarding_accel_ops *fwd_ops;
 
         /* Hardware header description */
         const struct header_ops *header_ops;
@@ -2388,7 +2417,7 @@ int dev_change_carrier(struct net_device *, bool new_carrier);
 int dev_get_phys_port_id(struct net_device *dev,
                          struct netdev_phys_port_id *ppid);
 int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev,
-                        struct netdev_queue *txq);
+                        struct netdev_queue *txq, void *accel_priv);
 int dev_forward_skb(struct net_device *dev, struct sk_buff *skb);
 
 extern int              netdev_budget;
@@ -2967,6 +2996,11 @@ static inline void netif_set_gso_max_size(struct net_device *dev,
         dev->gso_max_size = size;
 }
 
+static inline bool netif_is_macvlan(struct net_device *dev)
+{
+        return dev->priv_flags & IFF_MACVLAN;
+}
+
 static inline bool netif_is_bond_master(struct net_device *dev)
 {
         return dev->flags & IFF_MASTER && dev->priv_flags & IFF_BONDING;
diff --git a/include/uapi/linux/if.h b/include/uapi/linux/if.h
index 1ec407b01e46..d758163b0e43 100644
--- a/include/uapi/linux/if.h
+++ b/include/uapi/linux/if.h
@@ -83,6 +83,7 @@
 #define IFF_SUPP_NOFCS  0x80000         /* device supports sending custom FCS */
 #define IFF_LIVE_ADDR_CHANGE 0x100000   /* device supports hardware address
                                          * change when it's running */
+#define IFF_MACVLAN 0x200000            /* Macvlan device */
 
 
 #define IF_GET_IFACE    0x0001          /* for querying only */