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 /net/bridge | |
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 'net/bridge')
-rw-r--r-- | net/bridge/br_device.c | 3 | ||||
-rw-r--r-- | net/bridge/br_if.c | 5 | ||||
-rw-r--r-- | net/bridge/br_private.h | 3 |
3 files changed, 7 insertions, 4 deletions
diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c index feb77ea7b58e..772bad34794c 100644 --- a/net/bridge/br_device.c +++ b/net/bridge/br_device.c | |||
@@ -186,7 +186,8 @@ static void br_getinfo(struct net_device *dev, struct ethtool_drvinfo *info) | |||
186 | strcpy(info->bus_info, "N/A"); | 186 | strcpy(info->bus_info, "N/A"); |
187 | } | 187 | } |
188 | 188 | ||
189 | static u32 br_fix_features(struct net_device *dev, u32 features) | 189 | static netdev_features_t br_fix_features(struct net_device *dev, |
190 | netdev_features_t features) | ||
190 | { | 191 | { |
191 | struct net_bridge *br = netdev_priv(dev); | 192 | struct net_bridge *br = netdev_priv(dev); |
192 | 193 | ||
diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c index f603e5b0b930..0a942fbccc9a 100644 --- a/net/bridge/br_if.c +++ b/net/bridge/br_if.c | |||
@@ -296,10 +296,11 @@ int br_min_mtu(const struct net_bridge *br) | |||
296 | /* | 296 | /* |
297 | * Recomputes features using slave's features | 297 | * Recomputes features using slave's features |
298 | */ | 298 | */ |
299 | u32 br_features_recompute(struct net_bridge *br, u32 features) | 299 | netdev_features_t br_features_recompute(struct net_bridge *br, |
300 | netdev_features_t features) | ||
300 | { | 301 | { |
301 | struct net_bridge_port *p; | 302 | struct net_bridge_port *p; |
302 | u32 mask; | 303 | netdev_features_t mask; |
303 | 304 | ||
304 | if (list_empty(&br->port_list)) | 305 | if (list_empty(&br->port_list)) |
305 | return features; | 306 | return features; |
diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h index d7d6fb05411f..4027029aa5e4 100644 --- a/net/bridge/br_private.h +++ b/net/bridge/br_private.h | |||
@@ -387,7 +387,8 @@ extern int br_add_if(struct net_bridge *br, | |||
387 | extern int br_del_if(struct net_bridge *br, | 387 | extern int br_del_if(struct net_bridge *br, |
388 | struct net_device *dev); | 388 | struct net_device *dev); |
389 | extern int br_min_mtu(const struct net_bridge *br); | 389 | extern int br_min_mtu(const struct net_bridge *br); |
390 | extern u32 br_features_recompute(struct net_bridge *br, u32 features); | 390 | extern netdev_features_t br_features_recompute(struct net_bridge *br, |
391 | netdev_features_t features); | ||
391 | 392 | ||
392 | /* br_input.c */ | 393 | /* br_input.c */ |
393 | extern int br_handle_frame_finish(struct sk_buff *skb); | 394 | extern int br_handle_frame_finish(struct sk_buff *skb); |