diff options
| author | Anders Roxell <anders.roxell@linaro.org> | 2015-03-20 21:03:53 +0100 |
|---|---|---|
| committer | Anders Roxell <anders.roxell@linaro.org> | 2015-03-20 21:03:53 +0100 |
| commit | e20e8b472345ea5babd805db6726d1a7000f7673 (patch) | |
| tree | 1aaff25991578806a867ba3efcb0f7fd59940388 /include/net/ip.h | |
| parent | 588956edf5bb33741de41687677f21f5c37671da (diff) | |
| parent | c59ecb2edfc11b725a0fa4cb5420c4dbae482c17 (diff) | |
Merge tag 'v3.14.36-rt31-lno1' into linux-linaro-lsk-v3.14-rt
Linux 3.14.36-rt31
Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
Conflicts:
arch/arm64/kernel/setup.c
arch/x86/kernel/traps.c
Diffstat (limited to 'include/net/ip.h')
| -rw-r--r-- | include/net/ip.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/include/net/ip.h b/include/net/ip.h index 937f19681426..3446cdd29608 100644 --- a/include/net/ip.h +++ b/include/net/ip.h @@ -38,11 +38,12 @@ struct inet_skb_parm { struct ip_options opt; /* Compiled IP options */ unsigned char flags; -#define IPSKB_FORWARDED 1 -#define IPSKB_XFRM_TUNNEL_SIZE 2 -#define IPSKB_XFRM_TRANSFORMED 4 -#define IPSKB_FRAG_COMPLETE 8 -#define IPSKB_REROUTED 16 +#define IPSKB_FORWARDED BIT(0) +#define IPSKB_XFRM_TUNNEL_SIZE BIT(1) +#define IPSKB_XFRM_TRANSFORMED BIT(2) +#define IPSKB_FRAG_COMPLETE BIT(3) +#define IPSKB_REROUTED BIT(4) +#define IPSKB_DOREDIRECT BIT(5) u16 frag_max_size; }; @@ -174,7 +175,7 @@ static inline __u8 ip_reply_arg_flowi_flags(const struct ip_reply_arg *arg) return (arg->flags & IP_REPLY_ARG_NOSRCCHECK) ? FLOWI_FLAG_ANYSRC : 0; } -void ip_send_unicast_reply(struct net *net, struct sk_buff *skb, __be32 daddr, +void ip_send_unicast_reply(struct sock *sk, struct sk_buff *skb, __be32 daddr, __be32 saddr, const struct ip_reply_arg *arg, unsigned int len); |