mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-24 21:54:34 -04:00
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>
This commit is contained in:
parent
a59e2ecb85
commit
c8f44affb7
74 changed files with 305 additions and 202 deletions
|
|
@ -38,7 +38,7 @@ struct net_protocol {
|
|||
void (*err_handler)(struct sk_buff *skb, u32 info);
|
||||
int (*gso_send_check)(struct sk_buff *skb);
|
||||
struct sk_buff *(*gso_segment)(struct sk_buff *skb,
|
||||
u32 features);
|
||||
netdev_features_t features);
|
||||
struct sk_buff **(*gro_receive)(struct sk_buff **head,
|
||||
struct sk_buff *skb);
|
||||
int (*gro_complete)(struct sk_buff *skb);
|
||||
|
|
@ -57,7 +57,7 @@ struct inet6_protocol {
|
|||
|
||||
int (*gso_send_check)(struct sk_buff *skb);
|
||||
struct sk_buff *(*gso_segment)(struct sk_buff *skb,
|
||||
u32 features);
|
||||
netdev_features_t features);
|
||||
struct sk_buff **(*gro_receive)(struct sk_buff **head,
|
||||
struct sk_buff *skb);
|
||||
int (*gro_complete)(struct sk_buff *skb);
|
||||
|
|
|
|||
|
|
@ -306,8 +306,8 @@ struct sock {
|
|||
kmemcheck_bitfield_end(flags);
|
||||
int sk_wmem_queued;
|
||||
gfp_t sk_allocation;
|
||||
int sk_route_caps;
|
||||
int sk_route_nocaps;
|
||||
netdev_features_t sk_route_caps;
|
||||
netdev_features_t sk_route_nocaps;
|
||||
int sk_gso_type;
|
||||
unsigned int sk_gso_max_size;
|
||||
int sk_rcvlowat;
|
||||
|
|
@ -1393,7 +1393,7 @@ static inline int sk_can_gso(const struct sock *sk)
|
|||
|
||||
extern void sk_setup_caps(struct sock *sk, struct dst_entry *dst);
|
||||
|
||||
static inline void sk_nocaps_add(struct sock *sk, int flags)
|
||||
static inline void sk_nocaps_add(struct sock *sk, netdev_features_t flags)
|
||||
{
|
||||
sk->sk_route_nocaps |= flags;
|
||||
sk->sk_route_caps &= ~flags;
|
||||
|
|
|
|||
|
|
@ -1430,7 +1430,8 @@ extern struct request_sock_ops tcp6_request_sock_ops;
|
|||
extern void tcp_v4_destroy_sock(struct sock *sk);
|
||||
|
||||
extern int tcp_v4_gso_send_check(struct sk_buff *skb);
|
||||
extern struct sk_buff *tcp_tso_segment(struct sk_buff *skb, u32 features);
|
||||
extern struct sk_buff *tcp_tso_segment(struct sk_buff *skb,
|
||||
netdev_features_t features);
|
||||
extern struct sk_buff **tcp_gro_receive(struct sk_buff **head,
|
||||
struct sk_buff *skb);
|
||||
extern struct sk_buff **tcp4_gro_receive(struct sk_buff **head,
|
||||
|
|
|
|||
|
|
@ -258,5 +258,6 @@ extern void udp4_proc_exit(void);
|
|||
extern void udp_init(void);
|
||||
|
||||
extern int udp4_ufo_send_check(struct sk_buff *skb);
|
||||
extern struct sk_buff *udp4_ufo_fragment(struct sk_buff *skb, u32 features);
|
||||
extern struct sk_buff *udp4_ufo_fragment(struct sk_buff *skb,
|
||||
netdev_features_t features);
|
||||
#endif /* _UDP_H */
|
||||
|
|
|
|||
Loading…
Reference in a new issue