diff options
| author | Michał Mirosław <mirq-linux@rere.qmqm.pl> | 2011-05-07 03:22:17 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-05-12 18:40:56 -0400 |
| commit | afe12cc86b0ba545a01ad8716539ab07ab6e9e89 (patch) | |
| tree | edaa2912ae3acab49be8cfbfc75b689fdccd31f3 /net/core | |
| parent | 6c60408e33aba6d1d7241bc9be3b8d1b39509291 (diff) | |
| download | blackbird-op-linux-afe12cc86b0ba545a01ad8716539ab07ab6e9e89.tar.gz blackbird-op-linux-afe12cc86b0ba545a01ad8716539ab07ab6e9e89.zip | |
net: introduce netdev_change_features()
It will be needed by bonding and other drivers changing vlan_features
after ndo_init callback.
As a bonus, this includes kernel-doc for netdev_update_features().
Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/dev.c | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 75898a32c038..ea23353e6251 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -5289,6 +5289,14 @@ int __netdev_update_features(struct net_device *dev) return 1; } +/** + * netdev_update_features - recalculate device features + * @dev: the device to check + * + * Recalculate dev->features set and send notifications if it + * has changed. Should be called after driver or hardware dependent + * conditions might have changed that influence the features. + */ void netdev_update_features(struct net_device *dev) { if (__netdev_update_features(dev)) @@ -5297,6 +5305,23 @@ void netdev_update_features(struct net_device *dev) EXPORT_SYMBOL(netdev_update_features); /** + * netdev_change_features - recalculate device features + * @dev: the device to check + * + * Recalculate dev->features set and send notifications even + * if they have not changed. Should be called instead of + * netdev_update_features() if also dev->vlan_features might + * have changed to allow the changes to be propagated to stacked + * VLAN devices. + */ +void netdev_change_features(struct net_device *dev) +{ + __netdev_update_features(dev); + netdev_features_change(dev); +} +EXPORT_SYMBOL(netdev_change_features); + +/** * netif_stacked_transfer_operstate - transfer operstate * @rootdev: the root or lower level device to transfer state from * @dev: the device to transfer operstate to |
