From ae8bd60cf9e6ffa65e65deb7aa185c7f8c2f0433 Mon Sep 17 00:00:00 2001 From: Bill Sommerfeld Date: Tue, 19 Jul 2011 15:22:33 +0000 Subject: [PATCH] --- yaml --- r: 256610 b: refs/heads/master c: d9be4f7a6f5a8da3133b832eca41c3591420b1ca h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/ipv4/ip_output.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 226ba3c5293a..13467e7e1bf8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2e66f55b3afa290337a47e6ea134ac071c5dd9a7 +refs/heads/master: d9be4f7a6f5a8da3133b832eca41c3591420b1ca diff --git a/trunk/net/ipv4/ip_output.c b/trunk/net/ipv4/ip_output.c index be27e609a98b..ccaaa851ab42 100644 --- a/trunk/net/ipv4/ip_output.c +++ b/trunk/net/ipv4/ip_output.c @@ -734,7 +734,7 @@ static inline int ip_ufo_append_data(struct sock *sk, int getfrag(void *from, char *to, int offset, int len, int odd, struct sk_buff *skb), void *from, int length, int hh_len, int fragheaderlen, - int transhdrlen, int mtu, unsigned int flags) + int transhdrlen, int maxfraglen, unsigned int flags) { struct sk_buff *skb; int err; @@ -767,7 +767,7 @@ static inline int ip_ufo_append_data(struct sock *sk, skb->csum = 0; /* specify the length of each IP datagram fragment */ - skb_shinfo(skb)->gso_size = mtu - fragheaderlen; + skb_shinfo(skb)->gso_size = maxfraglen - fragheaderlen; skb_shinfo(skb)->gso_type = SKB_GSO_UDP; __skb_queue_tail(queue, skb); } @@ -831,7 +831,7 @@ static int __ip_append_data(struct sock *sk, (rt->dst.dev->features & NETIF_F_UFO) && !rt->dst.header_len) { err = ip_ufo_append_data(sk, queue, getfrag, from, length, hh_len, fragheaderlen, transhdrlen, - mtu, flags); + maxfraglen, flags); if (err) goto error; return 0;