Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4853a615 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

parents 9c869eda d91675f9

net/ipv6/ip6_output.c

+13 −2
Original line number Diff line number Diff line
@@ -494,6 +494,7 @@ static int ip6_fragment(struct sk_buff *skb, int (*output)(struct sk_buff *)) 
	struct net_device *dev;

	struct sk_buff *frag;

	struct rt6_info *rt = (struct rt6_info*)skb->dst;

	struct ipv6_pinfo *np = skb->sk ? inet6_sk(skb->sk) : NULL;

	struct ipv6hdr *tmp_hdr;

	struct frag_hdr *fh;

	unsigned int mtu, hlen, left, len;
@@ -505,7 +506,12 @@ static int ip6_fragment(struct sk_buff *skb, int (*output)(struct sk_buff *)) 
	hlen = ip6_find_1stfragopt(skb, &prevhdr);

	nexthdr = *prevhdr;



	mtu = dst_mtu(&rt->u.dst) - hlen - sizeof(struct frag_hdr);

	mtu = dst_mtu(&rt->u.dst);

	if (np && np->frag_size < mtu) {

		if (np->frag_size)

			mtu = np->frag_size;

	}

	mtu -= hlen + sizeof(struct frag_hdr);



	if (skb_shinfo(skb)->frag_list) {

		int first_len = skb_pagelen(skb);
@@ -882,7 +888,12 @@ int ip6_append_data(struct sock *sk, int getfrag(void *from, char *to, 
		inet->cork.fl = *fl;

		np->cork.hop_limit = hlimit;

		np->cork.tclass = tclass;

		inet->cork.fragsize = mtu = dst_mtu(rt->u.dst.path);

		mtu = dst_mtu(rt->u.dst.path);

		if (np && np->frag_size < mtu) {

			if (np->frag_size)

				mtu = np->frag_size;

		}

		inet->cork.fragsize = mtu;

		if (dst_allfrag(rt->u.dst.path))

			inet->cork.flags |= IPCORK_ALLFRAG;

		inet->cork.length = 0;

net/ipv6/ip6_tunnel.c

+1 −0
Original line number Diff line number Diff line
@@ -884,6 +884,7 @@ ip6ip6_tnl_change(struct ip6_tnl *t, struct ip6_tnl_parm *p) 
	t->parms.encap_limit = p->encap_limit;

	t->parms.flowinfo = p->flowinfo;

	t->parms.link = p->link;

	ip6_tnl_dst_reset(t);

	ip6ip6_tnl_link_config(t);

	return 0;

}