Patch "net: fix ndo_features_check/ndo_fix_features comment ordering" has been added to the 4.9-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
net: fix ndo_features_check/ndo_fix_features comment ordering
to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
net-fix-ndo_features_check-ndo_fix_features-comment-ordering.patch
and it can be found in the queue-4.9 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From foo@baz Thu Jun 15 12:25:36 CEST 2017
From: Dimitris Michailidis <[email protected]>
Date: Tue, 23 May 2017 21:54:02 -0400
Subject: net: fix ndo_features_check/ndo_fix_features comment ordering
From: Dimitris Michailidis <[email protected]>
[ Upstream commit 1a2a14444d32b89b28116daea86f63ced1716668 ]
Commit cdba756f5803a2 ("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.
--- include/linux/netdevice.h | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-)
include/linux/netdevice.h +15 -14
@@ -865,11 +865,15 @@ struct netdev_xdp {* of useless work if you return NETDEV_TX_BUSY. * Required; cannot 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. +* 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. * * u16 (*ndo_select_queue)(struct net_device *dev, struct sk_buff *skb, * void *accel_priv, select_queue_fallback_t fallback);
@@ -1027,6 +1031,12 @@ struct netdev_xdp {* 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()).
@@ -1099,15 +1109,6 @@ struct netdev_xdp {* Callback to use for xmit over the accelerated station. This * is used in place of ndo_start_xmit on accelerated net * 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 queue_index, u32 maxrate); * Called when a user wants to set a max-rate limitation of specific
Patches currently in stable-queue which might be from [email protected] are
queue-4.9/net-fix-ndo_features_check-ndo_fix_features-comment-ordering.patch queue-4.9/ipv6-fix-flow-labels-when-the-traffic-class-is-non-0.patch