]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
net: Remove ndo_dfwd_start_xmit
authorMintz, Yuval <Yuval.Mintz@cavium.com>
Sun, 25 Jun 2017 08:09:12 +0000 (11:09 +0300)
committerDavid S. Miller <davem@davemloft.net>
Sun, 25 Jun 2017 15:56:30 +0000 (11:56 -0400)
Looks like commit f663dd9aaf9e ("net: core: explicitly select a txq before doing l2 forwarding")
has removed the need for this dedicated xmit function [it even explicitly
states so in its commit log message] but it hasn't removed the definition
of the ndo.

Signed-off-by: Yuval Mintz <Yuval.Mintz@cavium.com>
CC: Jason Wang <jasowang@redhat.com>
CC: John Fastabend <john.r.fastabend@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
include/linux/netdevice.h

index 68f5d899d1e6cc54f1c55d26c1d390ae22401417..85f01d6733408e567c40e222ec4a107f4381d23c 100644 (file)
@@ -1114,12 +1114,6 @@ struct xfrmdev_ops {
  *     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.
  * int (*ndo_set_tx_maxrate)(struct net_device *dev,
  *                          int queue_index, u32 maxrate);
  *     Called when a user wants to set a max-rate limitation of specific
@@ -1316,9 +1310,6 @@ struct net_device_ops {
        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);
        int                     (*ndo_get_lock_subclass)(struct net_device *dev);
        int                     (*ndo_set_tx_maxrate)(struct net_device *dev,
                                                      int queue_index,