diff options
author | Shan Wei <shanwei@cn.fujitsu.com> | 2010-04-15 12:43:08 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-04-16 02:36:37 -0400 |
commit | 4e15ed4d930297c127d280ca1d0c785be870def4 (patch) | |
tree | e0808d650ae66cf273758496100d3d24739a9e48 /net/sctp | |
parent | 0eecb784942792863b77dfe11e0c7e286e92db85 (diff) |
net: replace ipfragok with skb->local_df
As Herbert Xu said: we should be able to simply replace ipfragok
with skb->local_df. commit f88037(sctp: Drop ipfargok in sctp_xmit function)
has droped ipfragok and set local_df value properly.
The patch kills the ipfragok parameter of .queue_xmit().
Signed-off-by: Shan Wei <shanwei@cn.fujitsu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sctp')
-rw-r--r-- | net/sctp/ipv6.c | 2 | ||||
-rw-r--r-- | net/sctp/protocol.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c index 14db5689fb89..732689140fb8 100644 --- a/net/sctp/ipv6.c +++ b/net/sctp/ipv6.c | |||
@@ -232,7 +232,7 @@ static int sctp_v6_xmit(struct sk_buff *skb, struct sctp_transport *transport) | |||
232 | if (!(transport->param_flags & SPP_PMTUD_ENABLE)) | 232 | if (!(transport->param_flags & SPP_PMTUD_ENABLE)) |
233 | skb->local_df = 1; | 233 | skb->local_df = 1; |
234 | 234 | ||
235 | return ip6_xmit(sk, skb, &fl, np->opt, 0); | 235 | return ip6_xmit(sk, skb, &fl, np->opt); |
236 | } | 236 | } |
237 | 237 | ||
238 | /* Returns the dst cache entry for the given source and destination ip | 238 | /* Returns the dst cache entry for the given source and destination ip |
diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c index a56f98e82f92..704298f4b284 100644 --- a/net/sctp/protocol.c +++ b/net/sctp/protocol.c | |||
@@ -854,7 +854,7 @@ static inline int sctp_v4_xmit(struct sk_buff *skb, | |||
854 | IP_PMTUDISC_DO : IP_PMTUDISC_DONT; | 854 | IP_PMTUDISC_DO : IP_PMTUDISC_DONT; |
855 | 855 | ||
856 | SCTP_INC_STATS(SCTP_MIB_OUTSCTPPACKS); | 856 | SCTP_INC_STATS(SCTP_MIB_OUTSCTPPACKS); |
857 | return ip_queue_xmit(skb, 0); | 857 | return ip_queue_xmit(skb); |
858 | } | 858 | } |
859 | 859 | ||
860 | static struct sctp_af sctp_af_inet; | 860 | static struct sctp_af sctp_af_inet; |