aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/netdevice.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux/netdevice.h')
-rw-r--r--include/linux/netdevice.h12
1 files changed, 8 insertions, 4 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index a2a70cc70e7b..5c88ab19b3eb 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -769,7 +769,8 @@ struct netdev_phys_port_id {
769 * (can also return NETDEV_TX_LOCKED iff NETIF_F_LLTX) 769 * (can also return NETDEV_TX_LOCKED iff NETIF_F_LLTX)
770 * Required can not be NULL. 770 * Required can not be NULL.
771 * 771 *
772 * u16 (*ndo_select_queue)(struct net_device *dev, struct sk_buff *skb); 772 * u16 (*ndo_select_queue)(struct net_device *dev, struct sk_buff *skb,
773 * void *accel_priv);
773 * Called to decide which queue to when device supports multiple 774 * Called to decide which queue to when device supports multiple
774 * transmit queues. 775 * transmit queues.
775 * 776 *
@@ -990,7 +991,8 @@ struct net_device_ops {
990 netdev_tx_t (*ndo_start_xmit) (struct sk_buff *skb, 991 netdev_tx_t (*ndo_start_xmit) (struct sk_buff *skb,
991 struct net_device *dev); 992 struct net_device *dev);
992 u16 (*ndo_select_queue)(struct net_device *dev, 993 u16 (*ndo_select_queue)(struct net_device *dev,
993 struct sk_buff *skb); 994 struct sk_buff *skb,
995 void *accel_priv);
994 void (*ndo_change_rx_flags)(struct net_device *dev, 996 void (*ndo_change_rx_flags)(struct net_device *dev,
995 int flags); 997 int flags);
996 void (*ndo_set_rx_mode)(struct net_device *dev); 998 void (*ndo_set_rx_mode)(struct net_device *dev);
@@ -1532,7 +1534,8 @@ static inline void netdev_for_each_tx_queue(struct net_device *dev,
1532} 1534}
1533 1535
1534struct netdev_queue *netdev_pick_tx(struct net_device *dev, 1536struct netdev_queue *netdev_pick_tx(struct net_device *dev,
1535 struct sk_buff *skb); 1537 struct sk_buff *skb,
1538 void *accel_priv);
1536u16 __netdev_pick_tx(struct net_device *dev, struct sk_buff *skb); 1539u16 __netdev_pick_tx(struct net_device *dev, struct sk_buff *skb);
1537 1540
1538/* 1541/*
@@ -1834,6 +1837,7 @@ int dev_close(struct net_device *dev);
1834void dev_disable_lro(struct net_device *dev); 1837void dev_disable_lro(struct net_device *dev);
1835int dev_loopback_xmit(struct sk_buff *newskb); 1838int dev_loopback_xmit(struct sk_buff *newskb);
1836int dev_queue_xmit(struct sk_buff *skb); 1839int dev_queue_xmit(struct sk_buff *skb);
1840int dev_queue_xmit_accel(struct sk_buff *skb, void *accel_priv);
1837int register_netdevice(struct net_device *dev); 1841int register_netdevice(struct net_device *dev);
1838void unregister_netdevice_queue(struct net_device *dev, struct list_head *head); 1842void unregister_netdevice_queue(struct net_device *dev, struct list_head *head);
1839void unregister_netdevice_many(struct list_head *head); 1843void unregister_netdevice_many(struct list_head *head);
@@ -2486,7 +2490,7 @@ int dev_change_carrier(struct net_device *, bool new_carrier);
2486int dev_get_phys_port_id(struct net_device *dev, 2490int dev_get_phys_port_id(struct net_device *dev,
2487 struct netdev_phys_port_id *ppid); 2491 struct netdev_phys_port_id *ppid);
2488int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev, 2492int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev,
2489 struct netdev_queue *txq, void *accel_priv); 2493 struct netdev_queue *txq);
2490int dev_forward_skb(struct net_device *dev, struct sk_buff *skb); 2494int dev_forward_skb(struct net_device *dev, struct sk_buff *skb);
2491 2495
2492extern int netdev_budget; 2496extern int netdev_budget;