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/xen-netfront.c | |
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/xen-netfront.c')
-rw-r--r-- | drivers/net/xen-netfront.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c index 226faab23603..a6e379fbf377 100644 --- a/drivers/net/xen-netfront.c +++ b/drivers/net/xen-netfront.c | |||
@@ -203,7 +203,7 @@ static void xennet_sysfs_delif(struct net_device *netdev); | |||
203 | 203 | ||
204 | static int xennet_can_sg(struct net_device *dev) | 204 | static int xennet_can_sg(struct net_device *dev) |
205 | { | 205 | { |
206 | return dev->features & NETIF_F_SG; | 206 | return !!(dev->features & NETIF_F_SG); |
207 | } | 207 | } |
208 | 208 | ||
209 | 209 | ||
@@ -1190,7 +1190,8 @@ static void xennet_uninit(struct net_device *dev) | |||
1190 | gnttab_free_grant_references(np->gref_rx_head); | 1190 | gnttab_free_grant_references(np->gref_rx_head); |
1191 | } | 1191 | } |
1192 | 1192 | ||
1193 | static u32 xennet_fix_features(struct net_device *dev, u32 features) | 1193 | static netdev_features_t xennet_fix_features(struct net_device *dev, |
1194 | netdev_features_t features) | ||
1194 | { | 1195 | { |
1195 | struct netfront_info *np = netdev_priv(dev); | 1196 | struct netfront_info *np = netdev_priv(dev); |
1196 | int val; | 1197 | int val; |
@@ -1216,7 +1217,8 @@ static u32 xennet_fix_features(struct net_device *dev, u32 features) | |||
1216 | return features; | 1217 | return features; |
1217 | } | 1218 | } |
1218 | 1219 | ||
1219 | static int xennet_set_features(struct net_device *dev, u32 features) | 1220 | static int xennet_set_features(struct net_device *dev, |
1221 | netdev_features_t features) | ||
1220 | { | 1222 | { |
1221 | if (!(features & NETIF_F_SG) && dev->mtu > ETH_DATA_LEN) { | 1223 | if (!(features & NETIF_F_SG) && dev->mtu > ETH_DATA_LEN) { |
1222 | netdev_info(dev, "Reducing MTU because no SG offload"); | 1224 | netdev_info(dev, "Reducing MTU because no SG offload"); |