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/ethernet/atheros/atl1e | |
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/ethernet/atheros/atl1e')
-rw-r--r-- | drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c index 95483bcac1d0..c915c0873810 100644 --- a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c +++ b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c | |||
@@ -313,7 +313,7 @@ static void atl1e_set_multi(struct net_device *netdev) | |||
313 | } | 313 | } |
314 | } | 314 | } |
315 | 315 | ||
316 | static void __atl1e_vlan_mode(u32 features, u32 *mac_ctrl_data) | 316 | static void __atl1e_vlan_mode(netdev_features_t features, u32 *mac_ctrl_data) |
317 | { | 317 | { |
318 | if (features & NETIF_F_HW_VLAN_RX) { | 318 | if (features & NETIF_F_HW_VLAN_RX) { |
319 | /* enable VLAN tag insert/strip */ | 319 | /* enable VLAN tag insert/strip */ |
@@ -324,7 +324,8 @@ static void __atl1e_vlan_mode(u32 features, u32 *mac_ctrl_data) | |||
324 | } | 324 | } |
325 | } | 325 | } |
326 | 326 | ||
327 | static void atl1e_vlan_mode(struct net_device *netdev, u32 features) | 327 | static void atl1e_vlan_mode(struct net_device *netdev, |
328 | netdev_features_t features) | ||
328 | { | 329 | { |
329 | struct atl1e_adapter *adapter = netdev_priv(netdev); | 330 | struct atl1e_adapter *adapter = netdev_priv(netdev); |
330 | u32 mac_ctrl_data = 0; | 331 | u32 mac_ctrl_data = 0; |
@@ -370,7 +371,8 @@ static int atl1e_set_mac_addr(struct net_device *netdev, void *p) | |||
370 | return 0; | 371 | return 0; |
371 | } | 372 | } |
372 | 373 | ||
373 | static u32 atl1e_fix_features(struct net_device *netdev, u32 features) | 374 | static netdev_features_t atl1e_fix_features(struct net_device *netdev, |
375 | netdev_features_t features) | ||
374 | { | 376 | { |
375 | /* | 377 | /* |
376 | * Since there is no support for separate rx/tx vlan accel | 378 | * Since there is no support for separate rx/tx vlan accel |
@@ -384,9 +386,10 @@ static u32 atl1e_fix_features(struct net_device *netdev, u32 features) | |||
384 | return features; | 386 | return features; |
385 | } | 387 | } |
386 | 388 | ||
387 | static int atl1e_set_features(struct net_device *netdev, u32 features) | 389 | static int atl1e_set_features(struct net_device *netdev, |
390 | netdev_features_t features) | ||
388 | { | 391 | { |
389 | u32 changed = netdev->features ^ features; | 392 | netdev_features_t changed = netdev->features ^ features; |
390 | 393 | ||
391 | if (changed & NETIF_F_HW_VLAN_RX) | 394 | if (changed & NETIF_F_HW_VLAN_RX) |
392 | atl1e_vlan_mode(netdev, features); | 395 | atl1e_vlan_mode(netdev, features); |