diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2016-11-21 10:56:25 -0800 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2016-11-21 10:56:25 -0800 |
| commit | 84dc474f3c33c4fbbe42f46876e0dde502e60ad0 (patch) | |
| tree | 1c60e8369668a67042e47774ae4a389bbfc239b6 /include | |
| parent | 40ceb2c69964f8bde97d4ded4306508db16fd365 (diff) | |
| parent | 4eb9a81002485a7abfa53a334dde5bc10328079f (diff) | |
Merge tag 'v4.4.34' into android-4.4.y
This is the 4.4.34 stable release
Change-Id: Ic90323945584a7173f54595e0482d26fafd10174
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/filter.h | 6 | ||||
| -rw-r--r-- | include/net/ip6_tunnel.h | 1 | ||||
| -rw-r--r-- | include/net/tcp.h | 1 |
3 files changed, 7 insertions, 1 deletions
diff --git a/include/linux/filter.h b/include/linux/filter.h index 5110d4211866..ccb98b459c59 100644 --- a/include/linux/filter.h +++ b/include/linux/filter.h @@ -421,7 +421,11 @@ static inline void bpf_prog_unlock_ro(struct bpf_prog *fp) } #endif /* CONFIG_DEBUG_SET_MODULE_RONX */ -int sk_filter(struct sock *sk, struct sk_buff *skb); +int sk_filter_trim_cap(struct sock *sk, struct sk_buff *skb, unsigned int cap); +static inline int sk_filter(struct sock *sk, struct sk_buff *skb) +{ + return sk_filter_trim_cap(sk, skb, 1); +} int bpf_prog_select_runtime(struct bpf_prog *fp); void bpf_prog_free(struct bpf_prog *fp); diff --git a/include/net/ip6_tunnel.h b/include/net/ip6_tunnel.h index ff788b665277..9c2c044153f6 100644 --- a/include/net/ip6_tunnel.h +++ b/include/net/ip6_tunnel.h @@ -86,6 +86,7 @@ static inline void ip6tunnel_xmit(struct sock *sk, struct sk_buff *skb, struct net_device_stats *stats = &dev->stats; int pkt_len, err; + memset(skb->cb, 0, sizeof(struct inet6_skb_parm)); pkt_len = skb->len - skb_inner_network_offset(skb); err = ip6_local_out(dev_net(skb_dst(skb)->dev), sk, skb); diff --git a/include/net/tcp.h b/include/net/tcp.h index 6c480679423e..4ea373913c9c 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -1157,6 +1157,7 @@ static inline void tcp_prequeue_init(struct tcp_sock *tp) } bool tcp_prequeue(struct sock *sk, struct sk_buff *skb); +int tcp_filter(struct sock *sk, struct sk_buff *skb); #undef STATE_TRACE |