inet: Replace left-over references to inet->cork
authorHerbert Xu <herbert@gondor.apana.org.au>
Wed, 2 Mar 2011 07:00:58 +0000 (23:00 -0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 2 Mar 2011 07:00:58 +0000 (23:00 -0800)
The patch to replace inet->cork with cork left out two spots in
__ip_append_data that can result in bogus packet construction.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/ip_output.c

index 68dbe2d93d9d993c06c8f3dc412071c1eb8e2f16..33316b3534cab9ead840d9cb920ad11ff1a0bc1a 100644 (file)
@@ -789,7 +789,7 @@ static int __ip_append_data(struct sock *sk, struct sk_buff_head *queue,
        struct inet_sock *inet = inet_sk(sk);
        struct sk_buff *skb;
 
-       struct ip_options *opt = inet->cork.opt;
+       struct ip_options *opt = cork->opt;
        int hh_len;
        int exthdrlen;
        int mtu;
@@ -803,7 +803,7 @@ static int __ip_append_data(struct sock *sk, struct sk_buff_head *queue,
        exthdrlen = transhdrlen ? rt->dst.header_len : 0;
        length += exthdrlen;
        transhdrlen += exthdrlen;
-       mtu = inet->cork.fragsize;
+       mtu = cork->fragsize;
 
        hh_len = LL_RESERVED_SPACE(rt->dst.dev);