diff options
Diffstat (limited to 'net/ipv4/tcp_ipv4.c')
| -rw-r--r-- | net/ipv4/tcp_ipv4.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 9b62d80bb20f..5c70493dff02 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c | |||
| @@ -270,8 +270,7 @@ failure: | |||
| 270 | /* | 270 | /* |
| 271 | * This routine does path mtu discovery as defined in RFC1191. | 271 | * This routine does path mtu discovery as defined in RFC1191. |
| 272 | */ | 272 | */ |
| 273 | static inline void do_pmtu_discovery(struct sock *sk, struct iphdr *iph, | 273 | static void do_pmtu_discovery(struct sock *sk, struct iphdr *iph, u32 mtu) |
| 274 | u32 mtu) | ||
| 275 | { | 274 | { |
| 276 | struct dst_entry *dst; | 275 | struct dst_entry *dst; |
| 277 | struct inet_sock *inet = inet_sk(sk); | 276 | struct inet_sock *inet = inet_sk(sk); |
| @@ -662,7 +661,7 @@ static void tcp_v4_reqsk_destructor(struct request_sock *req) | |||
| 662 | kfree(inet_rsk(req)->opt); | 661 | kfree(inet_rsk(req)->opt); |
| 663 | } | 662 | } |
| 664 | 663 | ||
| 665 | static inline void syn_flood_warning(struct sk_buff *skb) | 664 | static void syn_flood_warning(struct sk_buff *skb) |
| 666 | { | 665 | { |
| 667 | static unsigned long warntime; | 666 | static unsigned long warntime; |
| 668 | 667 | ||
| @@ -677,8 +676,8 @@ static inline void syn_flood_warning(struct sk_buff *skb) | |||
| 677 | /* | 676 | /* |
| 678 | * Save and compile IPv4 options into the request_sock if needed. | 677 | * Save and compile IPv4 options into the request_sock if needed. |
| 679 | */ | 678 | */ |
| 680 | static inline struct ip_options *tcp_v4_save_options(struct sock *sk, | 679 | static struct ip_options *tcp_v4_save_options(struct sock *sk, |
| 681 | struct sk_buff *skb) | 680 | struct sk_buff *skb) |
| 682 | { | 681 | { |
| 683 | struct ip_options *opt = &(IPCB(skb)->opt); | 682 | struct ip_options *opt = &(IPCB(skb)->opt); |
| 684 | struct ip_options *dopt = NULL; | 683 | struct ip_options *dopt = NULL; |
