diff options
| author | Shan Wei <shanwei@cn.fujitsu.com> | 2010-04-15 16:43:08 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-15 23:36:37 -0700 |
| commit | 4e15ed4d930297c127d280ca1d0c785be870def4 (patch) | |
| tree | e0808d650ae66cf273758496100d3d24739a9e48 /net/l2tp | |
| parent | 0eecb784942792863b77dfe11e0c7e286e92db85 (diff) | |
| download | linux-3.10-4e15ed4d930297c127d280ca1d0c785be870def4.tar.gz linux-3.10-4e15ed4d930297c127d280ca1d0c785be870def4.tar.bz2 linux-3.10-4e15ed4d930297c127d280ca1d0c785be870def4.zip | |
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/l2tp')
| -rw-r--r-- | net/l2tp/l2tp_core.c | 3 | ||||
| -rw-r--r-- | net/l2tp/l2tp_ip.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/net/l2tp/l2tp_core.c b/net/l2tp/l2tp_core.c index 98dfcce1a5f..ecc7aea9efe 100644 --- a/net/l2tp/l2tp_core.c +++ b/net/l2tp/l2tp_core.c @@ -954,7 +954,8 @@ int l2tp_xmit_core(struct l2tp_session *session, struct sk_buff *skb, size_t dat } /* Queue the packet to IP for output */ - error = ip_queue_xmit(skb, 1); + skb->local_df = 1; + error = ip_queue_xmit(skb); /* Update stats */ if (error >= 0) { diff --git a/net/l2tp/l2tp_ip.c b/net/l2tp/l2tp_ip.c index 75bf784ba18..0852512d392 100644 --- a/net/l2tp/l2tp_ip.c +++ b/net/l2tp/l2tp_ip.c @@ -501,7 +501,7 @@ static int l2tp_ip_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *m skb_dst_set(skb, dst_clone(&rt->u.dst)); /* Queue the packet to IP for output */ - rc = ip_queue_xmit(skb, 0); + rc = ip_queue_xmit(skb); error: /* Update stats */ |