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 /include/net/sock.h | |
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 'include/net/sock.h')
-rw-r--r-- | include/net/sock.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index 67cd4581b6da..1331008ad885 100644 --- a/include/net/sock.h +++ b/include/net/sock.h | |||
@@ -306,8 +306,8 @@ struct sock { | |||
306 | kmemcheck_bitfield_end(flags); | 306 | kmemcheck_bitfield_end(flags); |
307 | int sk_wmem_queued; | 307 | int sk_wmem_queued; |
308 | gfp_t sk_allocation; | 308 | gfp_t sk_allocation; |
309 | int sk_route_caps; | 309 | netdev_features_t sk_route_caps; |
310 | int sk_route_nocaps; | 310 | netdev_features_t sk_route_nocaps; |
311 | int sk_gso_type; | 311 | int sk_gso_type; |
312 | unsigned int sk_gso_max_size; | 312 | unsigned int sk_gso_max_size; |
313 | int sk_rcvlowat; | 313 | int sk_rcvlowat; |
@@ -1393,7 +1393,7 @@ static inline int sk_can_gso(const struct sock *sk) | |||
1393 | 1393 | ||
1394 | extern void sk_setup_caps(struct sock *sk, struct dst_entry *dst); | 1394 | extern void sk_setup_caps(struct sock *sk, struct dst_entry *dst); |
1395 | 1395 | ||
1396 | static inline void sk_nocaps_add(struct sock *sk, int flags) | 1396 | static inline void sk_nocaps_add(struct sock *sk, netdev_features_t flags) |
1397 | { | 1397 | { |
1398 | sk->sk_route_nocaps |= flags; | 1398 | sk->sk_route_nocaps |= flags; |
1399 | sk->sk_route_caps &= ~flags; | 1399 | sk->sk_route_caps &= ~flags; |