diff options
| author | Hannes Frederic Sowa <hannes@stressinduktion.org> | 2013-08-13 04:35:58 +0200 |
|---|---|---|
| committer | Steffen Klassert <steffen.klassert@secunet.com> | 2013-08-14 13:09:07 +0200 |
| commit | 0ea9d5e3e0e03a63b11392f5613378977dae7eca (patch) | |
| tree | a363333080f9f8647f3f80dc7e736a308c36b7cb /net/ipv4/ip_output.c | |
| parent | 628e341f319f1a64a4639088faba952e4ec8f0a8 (diff) | |
| download | linux-stable-0ea9d5e3e0e03a63b11392f5613378977dae7eca.tar.gz linux-stable-0ea9d5e3e0e03a63b11392f5613378977dae7eca.tar.bz2 linux-stable-0ea9d5e3e0e03a63b11392f5613378977dae7eca.zip | |
xfrm: introduce helper for safe determination of mtu
skb->sk socket can be of AF_INET or AF_INET6 address family. Thus we
always have to make sure we a referring to the correct interpretation
of skb->sk.
We only depend on header defines to query the mtu, so we don't introduce
a new dependency to ipv6 by this change.
Cc: Steffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Diffstat (limited to 'net/ipv4/ip_output.c')
| -rw-r--r-- | net/ipv4/ip_output.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c index 4bcabf3ab4ca..9ee17e3d11c3 100644 --- a/net/ipv4/ip_output.c +++ b/net/ipv4/ip_output.c @@ -211,14 +211,6 @@ static inline int ip_finish_output2(struct sk_buff *skb) return -EINVAL; } -static inline int ip_skb_dst_mtu(struct sk_buff *skb) -{ - struct inet_sock *inet = skb->sk ? inet_sk(skb->sk) : NULL; - - return (inet && inet->pmtudisc == IP_PMTUDISC_PROBE) ? - skb_dst(skb)->dev->mtu : dst_mtu(skb_dst(skb)); -} - static int ip_finish_output(struct sk_buff *skb) { #if defined(CONFIG_NETFILTER) && defined(CONFIG_XFRM) |