diff options
Diffstat (limited to 'net/ipv6/ip6_output.c')
-rw-r--r-- | net/ipv6/ip6_output.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index c10a38a71a5e..7f12e30cfa73 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c | |||
@@ -37,6 +37,7 @@ | |||
37 | #include <linux/tcp.h> | 37 | #include <linux/tcp.h> |
38 | #include <linux/route.h> | 38 | #include <linux/route.h> |
39 | #include <linux/module.h> | 39 | #include <linux/module.h> |
40 | #include <linux/slab.h> | ||
40 | 41 | ||
41 | #include <linux/netfilter.h> | 42 | #include <linux/netfilter.h> |
42 | #include <linux/netfilter_ipv6.h> | 43 | #include <linux/netfilter_ipv6.h> |
@@ -178,11 +179,11 @@ int ip6_output(struct sk_buff *skb) | |||
178 | } | 179 | } |
179 | 180 | ||
180 | /* | 181 | /* |
181 | * xmit an sk_buff (used by TCP) | 182 | * xmit an sk_buff (used by TCP, SCTP and DCCP) |
182 | */ | 183 | */ |
183 | 184 | ||
184 | int ip6_xmit(struct sock *sk, struct sk_buff *skb, struct flowi *fl, | 185 | int ip6_xmit(struct sock *sk, struct sk_buff *skb, struct flowi *fl, |
185 | struct ipv6_txoptions *opt, int ipfragok) | 186 | struct ipv6_txoptions *opt) |
186 | { | 187 | { |
187 | struct net *net = sock_net(sk); | 188 | struct net *net = sock_net(sk); |
188 | struct ipv6_pinfo *np = inet6_sk(sk); | 189 | struct ipv6_pinfo *np = inet6_sk(sk); |
@@ -228,10 +229,6 @@ int ip6_xmit(struct sock *sk, struct sk_buff *skb, struct flowi *fl, | |||
228 | skb_reset_network_header(skb); | 229 | skb_reset_network_header(skb); |
229 | hdr = ipv6_hdr(skb); | 230 | hdr = ipv6_hdr(skb); |
230 | 231 | ||
231 | /* Allow local fragmentation. */ | ||
232 | if (ipfragok) | ||
233 | skb->local_df = 1; | ||
234 | |||
235 | /* | 232 | /* |
236 | * Fill in the IPv6 header | 233 | * Fill in the IPv6 header |
237 | */ | 234 | */ |