diff options
author | Michał Mirosław <mirq-linux@rere.qmqm.pl> | 2011-11-15 10:29:55 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-11-16 17:43:10 -0500 |
commit | c8f44affb7244f2ac3e703cab13d55ede27621bb (patch) | |
tree | 62e7aea2916a8d7cab825fe500670c5113854c0f /drivers/net/bonding | |
parent | a59e2ecb859f2ab03bb2e230709f8039472ad2c3 (diff) |
net: introduce and use netdev_features_t for device features sets
v2: add couple missing conversions in drivers
split unexporting netdev_fix_features()
implemented %pNF
convert sock::sk_route_(no?)caps
Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bonding')
-rw-r--r-- | drivers/net/bonding/bond_main.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index b0c577256487..ac5337a04639 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c | |||
@@ -1325,11 +1325,12 @@ static int bond_sethwaddr(struct net_device *bond_dev, | |||
1325 | return 0; | 1325 | return 0; |
1326 | } | 1326 | } |
1327 | 1327 | ||
1328 | static u32 bond_fix_features(struct net_device *dev, u32 features) | 1328 | static netdev_features_t bond_fix_features(struct net_device *dev, |
1329 | netdev_features_t features) | ||
1329 | { | 1330 | { |
1330 | struct slave *slave; | 1331 | struct slave *slave; |
1331 | struct bonding *bond = netdev_priv(dev); | 1332 | struct bonding *bond = netdev_priv(dev); |
1332 | u32 mask; | 1333 | netdev_features_t mask; |
1333 | int i; | 1334 | int i; |
1334 | 1335 | ||
1335 | read_lock(&bond->lock); | 1336 | read_lock(&bond->lock); |
@@ -1363,7 +1364,7 @@ static void bond_compute_features(struct bonding *bond) | |||
1363 | { | 1364 | { |
1364 | struct slave *slave; | 1365 | struct slave *slave; |
1365 | struct net_device *bond_dev = bond->dev; | 1366 | struct net_device *bond_dev = bond->dev; |
1366 | u32 vlan_features = BOND_VLAN_FEATURES; | 1367 | netdev_features_t vlan_features = BOND_VLAN_FEATURES; |
1367 | unsigned short max_hard_header_len = ETH_HLEN; | 1368 | unsigned short max_hard_header_len = ETH_HLEN; |
1368 | int i; | 1369 | int i; |
1369 | 1370 | ||
@@ -1897,7 +1898,7 @@ int bond_release(struct net_device *bond_dev, struct net_device *slave_dev) | |||
1897 | struct bonding *bond = netdev_priv(bond_dev); | 1898 | struct bonding *bond = netdev_priv(bond_dev); |
1898 | struct slave *slave, *oldcurrent; | 1899 | struct slave *slave, *oldcurrent; |
1899 | struct sockaddr addr; | 1900 | struct sockaddr addr; |
1900 | u32 old_features = bond_dev->features; | 1901 | netdev_features_t old_features = bond_dev->features; |
1901 | 1902 | ||
1902 | /* slave is not a slave or master is not master of this slave */ | 1903 | /* slave is not a slave or master is not master of this slave */ |
1903 | if (!(slave_dev->flags & IFF_SLAVE) || | 1904 | if (!(slave_dev->flags & IFF_SLAVE) || |