diff options
| author | Eric Dumazet <edumazet@google.com> | 2014-09-27 09:50:55 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-09-28 16:35:42 -0400 |
| commit | 24a2d43d8886f5a29c3cf108927f630c545a9a38 (patch) | |
| tree | dd10e0199c6627b0eb93340f35d88d122c01f2ab /net/ipv4/ip_output.c | |
| parent | ff04a771ad25fc9ba91690e73465b4d34b6bf8b3 (diff) | |
| download | linux-24a2d43d8886f5a29c3cf108927f630c545a9a38.tar.gz linux-24a2d43d8886f5a29c3cf108927f630c545a9a38.tar.bz2 linux-24a2d43d8886f5a29c3cf108927f630c545a9a38.zip | |
ipv4: rename ip_options_echo to __ip_options_echo()
ip_options_echo() assumes struct ip_options is provided in &IPCB(skb)->opt
Lets break this assumption, but provide a helper to not change all call points.
ip_send_unicast_reply() gets a new struct ip_options pointer.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ip_output.c')
| -rw-r--r-- | net/ipv4/ip_output.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c index 215af2b155cb..c8fa62476461 100644 --- a/net/ipv4/ip_output.c +++ b/net/ipv4/ip_output.c @@ -1522,8 +1522,10 @@ static DEFINE_PER_CPU(struct inet_sock, unicast_sock) = { .uc_ttl = -1, }; -void ip_send_unicast_reply(struct net *net, struct sk_buff *skb, __be32 daddr, - __be32 saddr, const struct ip_reply_arg *arg, +void ip_send_unicast_reply(struct net *net, struct sk_buff *skb, + const struct ip_options *sopt, + __be32 daddr, __be32 saddr, + const struct ip_reply_arg *arg, unsigned int len) { struct ip_options_data replyopts; @@ -1534,7 +1536,7 @@ void ip_send_unicast_reply(struct net *net, struct sk_buff *skb, __be32 daddr, struct sock *sk; struct inet_sock *inet; - if (ip_options_echo(&replyopts.opt.opt, skb)) + if (__ip_options_echo(&replyopts.opt.opt, skb, sopt)) return; ipc.addr = daddr; |