Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Merge net into net-next because some upcoming net-next changes build on top of bug fixes that went into net. Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
@@ -2750,6 +2750,17 @@ static inline netdev_features_t netdev_get_wanted_features(
|
||||
}
|
||||
netdev_features_t netdev_increment_features(netdev_features_t all,
|
||||
netdev_features_t one, netdev_features_t mask);
|
||||
|
||||
/* Allow TSO being used on stacked device :
|
||||
* Performing the GSO segmentation before last device
|
||||
* is a performance improvement.
|
||||
*/
|
||||
static inline netdev_features_t netdev_add_tso_features(netdev_features_t features,
|
||||
netdev_features_t mask)
|
||||
{
|
||||
return netdev_increment_features(features, NETIF_F_ALL_TSO, mask);
|
||||
}
|
||||
|
||||
int __netdev_update_features(struct net_device *dev);
|
||||
void netdev_update_features(struct net_device *dev);
|
||||
void netdev_change_features(struct net_device *dev);
|
||||
|
Reference in New Issue
Block a user