Commit f4d2d05f authored by Dimitris Michailidis's avatar Dimitris Michailidis Committed by Greg Kroah-Hartman

net: fix ndo_features_check/ndo_fix_features comment ordering


[ Upstream commit 1a2a1444 ]

Commit cdba756f ("net: move ndo_features_check() close to
ndo_start_xmit()") inadvertently moved the doc comment for
.ndo_fix_features instead of .ndo_features_check. Fix the comment
ordering.

Fixes: cdba756f ("net: move ndo_features_check() close to ndo_start_xmit()")
Signed-off-by: default avatarDimitris Michailidis <dmichail@google.com>
Acked-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <alexander.levin@verizon.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3a6ebd3f
...@@ -865,11 +865,15 @@ struct netdev_xdp { ...@@ -865,11 +865,15 @@ struct netdev_xdp {
* of useless work if you return NETDEV_TX_BUSY. * of useless work if you return NETDEV_TX_BUSY.
* Required; cannot be NULL. * Required; cannot be NULL.
* *
* netdev_features_t (*ndo_fix_features)(struct net_device *dev, * netdev_features_t (*ndo_features_check)(struct sk_buff *skb,
* struct net_device *dev
* netdev_features_t features); * netdev_features_t features);
* Adjusts the requested feature flags according to device-specific * Called by core transmit path to determine if device is capable of
* constraints, and returns the resulting flags. Must not modify * performing offload operations on a given packet. This is to give
* the device state. * the device an opportunity to implement any restrictions that cannot
* be otherwise expressed by feature flags. The check is called with
* the set of features that the stack has calculated and it returns
* those the driver believes to be appropriate.
* *
* u16 (*ndo_select_queue)(struct net_device *dev, struct sk_buff *skb, * u16 (*ndo_select_queue)(struct net_device *dev, struct sk_buff *skb,
* void *accel_priv, select_queue_fallback_t fallback); * void *accel_priv, select_queue_fallback_t fallback);
...@@ -1027,6 +1031,12 @@ struct netdev_xdp { ...@@ -1027,6 +1031,12 @@ struct netdev_xdp {
* Called to release previously enslaved netdev. * Called to release previously enslaved netdev.
* *
* Feature/offload setting functions. * 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); * int (*ndo_set_features)(struct net_device *dev, netdev_features_t features);
* Called to update device configuration to new features. Passed * Called to update device configuration to new features. Passed
* feature set might be less than what was returned by ndo_fix_features()). * feature set might be less than what was returned by ndo_fix_features()).
...@@ -1099,15 +1109,6 @@ struct netdev_xdp { ...@@ -1099,15 +1109,6 @@ struct netdev_xdp {
* Callback to use for xmit over the accelerated station. This * Callback to use for xmit over the accelerated station. This
* is used in place of ndo_start_xmit on accelerated net * is used in place of ndo_start_xmit on accelerated net
* devices. * devices.
* netdev_features_t (*ndo_features_check)(struct sk_buff *skb,
* struct net_device *dev
* netdev_features_t features);
* Called by core transmit path to determine if device is capable of
* performing offload operations on a given packet. This is to give
* the device an opportunity to implement any restrictions that cannot
* be otherwise expressed by feature flags. The check is called with
* the set of features that the stack has calculated and it returns
* those the driver believes to be appropriate.
* int (*ndo_set_tx_maxrate)(struct net_device *dev, * int (*ndo_set_tx_maxrate)(struct net_device *dev,
* int queue_index, u32 maxrate); * int queue_index, u32 maxrate);
* Called when a user wants to set a max-rate limitation of specific * Called when a user wants to set a max-rate limitation of specific
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment