aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/netdevice.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2013-05-24 19:48:28 -0400
committerDavid S. Miller <davem@davemloft.net>2013-05-24 19:48:28 -0400
commite6ff4c75f9095f61b3a66c2a78e47b62864022dd (patch)
tree425ea9463cbec0b1975b8a33d9a56817143055d0 /include/linux/netdevice.h
parentee9c799c231324de681eb21e06d8bf4842768b75 (diff)
parent0e255f1c0c9add2f0c920240ac4cadc28ae274c3 (diff)
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>
Diffstat (limited to 'include/linux/netdevice.h')
-rw-r--r--include/linux/netdevice.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 7dd535d4b41e..0ebd63ae2cc8 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -2750,6 +2750,17 @@ static inline netdev_features_t netdev_get_wanted_features(
2750} 2750}
2751netdev_features_t netdev_increment_features(netdev_features_t all, 2751netdev_features_t netdev_increment_features(netdev_features_t all,
2752 netdev_features_t one, netdev_features_t mask); 2752 netdev_features_t one, netdev_features_t mask);
2753
2754/* Allow TSO being used on stacked device :
2755 * Performing the GSO segmentation before last device
2756 * is a performance improvement.
2757 */
2758static inline netdev_features_t netdev_add_tso_features(netdev_features_t features,
2759 netdev_features_t mask)
2760{
2761 return netdev_increment_features(features, NETIF_F_ALL_TSO, mask);
2762}
2763
2753int __netdev_update_features(struct net_device *dev); 2764int __netdev_update_features(struct net_device *dev);
2754void netdev_update_features(struct net_device *dev); 2765void netdev_update_features(struct net_device *dev);
2755void netdev_change_features(struct net_device *dev); 2766void netdev_change_features(struct net_device *dev);