|
@@ -812,6 +812,12 @@ typedef u16 (*select_queue_fallback_t)(struct net_device *dev,
|
|
|
* (can also return NETDEV_TX_LOCKED iff NETIF_F_LLTX)
|
|
|
* Required can not be NULL.
|
|
|
*
|
|
|
+ * netdev_features_t (*ndo_fix_features)(struct net_device *dev,
|
|
|
+ * netdev_features_t features);
|
|
|
+ * Adjusts the requested feature flags according to device-specific
|
|
|
+ * constraints, and returns the resulting flags. Must not modify
|
|
|
+ * the device state.
|
|
|
+ *
|
|
|
* u16 (*ndo_select_queue)(struct net_device *dev, struct sk_buff *skb,
|
|
|
* void *accel_priv, select_queue_fallback_t fallback);
|
|
|
* Called to decide which queue to when device supports multiple
|
|
@@ -959,12 +965,6 @@ typedef u16 (*select_queue_fallback_t)(struct net_device *dev,
|
|
|
* Called to release previously enslaved netdev.
|
|
|
*
|
|
|
* Feature/offload setting functions.
|
|
|
- * netdev_features_t (*ndo_fix_features)(struct net_device *dev,
|
|
|
- * netdev_features_t features);
|
|
|
- * Adjusts the requested feature flags according to device-specific
|
|
|
- * constraints, and returns the resulting flags. Must not modify
|
|
|
- * the device state.
|
|
|
- *
|
|
|
* int (*ndo_set_features)(struct net_device *dev, netdev_features_t features);
|
|
|
* Called to update device configuration to new features. Passed
|
|
|
* feature set might be less than what was returned by ndo_fix_features()).
|
|
@@ -1081,8 +1081,11 @@ struct net_device_ops {
|
|
|
void (*ndo_uninit)(struct net_device *dev);
|
|
|
int (*ndo_open)(struct net_device *dev);
|
|
|
int (*ndo_stop)(struct net_device *dev);
|
|
|
- netdev_tx_t (*ndo_start_xmit) (struct sk_buff *skb,
|
|
|
- struct net_device *dev);
|
|
|
+ netdev_tx_t (*ndo_start_xmit)(struct sk_buff *skb,
|
|
|
+ struct net_device *dev);
|
|
|
+ netdev_features_t (*ndo_features_check)(struct sk_buff *skb,
|
|
|
+ struct net_device *dev,
|
|
|
+ netdev_features_t features);
|
|
|
u16 (*ndo_select_queue)(struct net_device *dev,
|
|
|
struct sk_buff *skb,
|
|
|
void *accel_priv,
|
|
@@ -1245,9 +1248,6 @@ struct net_device_ops {
|
|
|
struct net_device *dev,
|
|
|
void *priv);
|
|
|
int (*ndo_get_lock_subclass)(struct net_device *dev);
|
|
|
- netdev_features_t (*ndo_features_check) (struct sk_buff *skb,
|
|
|
- struct net_device *dev,
|
|
|
- netdev_features_t features);
|
|
|
int (*ndo_set_tx_maxrate)(struct net_device *dev,
|
|
|
int queue_index,
|
|
|
u32 maxrate);
|