aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/tun.c
diff options
context:
space:
mode:
authorMichał Mirosław <mirq-linux@rere.qmqm.pl>2011-11-15 10:29:55 -0500
committerDavid S. Miller <davem@davemloft.net>2011-11-16 17:43:10 -0500
commitc8f44affb7244f2ac3e703cab13d55ede27621bb (patch)
tree62e7aea2916a8d7cab825fe500670c5113854c0f /drivers/net/tun.c
parenta59e2ecb859f2ab03bb2e230709f8039472ad2c3 (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/tun.c')
-rw-r--r--drivers/net/tun.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 8592523b0bb5..3dd13d606d00 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -123,7 +123,7 @@ struct tun_struct {
123 gid_t group; 123 gid_t group;
124 124
125 struct net_device *dev; 125 struct net_device *dev;
126 u32 set_features; 126 netdev_features_t set_features;
127#define TUN_USER_FEATURES (NETIF_F_HW_CSUM|NETIF_F_TSO_ECN|NETIF_F_TSO| \ 127#define TUN_USER_FEATURES (NETIF_F_HW_CSUM|NETIF_F_TSO_ECN|NETIF_F_TSO| \
128 NETIF_F_TSO6|NETIF_F_UFO) 128 NETIF_F_TSO6|NETIF_F_UFO)
129 struct fasync_struct *fasync; 129 struct fasync_struct *fasync;
@@ -454,7 +454,8 @@ tun_net_change_mtu(struct net_device *dev, int new_mtu)
454 return 0; 454 return 0;
455} 455}
456 456
457static u32 tun_net_fix_features(struct net_device *dev, u32 features) 457static netdev_features_t tun_net_fix_features(struct net_device *dev,
458 netdev_features_t features)
458{ 459{
459 struct tun_struct *tun = netdev_priv(dev); 460 struct tun_struct *tun = netdev_priv(dev);
460 461
@@ -1196,7 +1197,7 @@ static int tun_get_iff(struct net *net, struct tun_struct *tun,
1196 * privs required. */ 1197 * privs required. */
1197static int set_offload(struct tun_struct *tun, unsigned long arg) 1198static int set_offload(struct tun_struct *tun, unsigned long arg)
1198{ 1199{
1199 u32 features = 0; 1200 netdev_features_t features = 0;
1200 1201
1201 if (arg & TUN_F_CSUM) { 1202 if (arg & TUN_F_CSUM) {
1202 features |= NETIF_F_HW_CSUM; 1203 features |= NETIF_F_HW_CSUM;