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

Commit cb18eccf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (45 commits)
  [IPV4]: Restore multipath routing after rt_next changes.
  [XFRM] IPV6: Fix outbound RO transformation which is broken by IPsec tunnel patch.
  [NET]: Reorder fields of struct dst_entry
  [DECNET]: Convert decnet route to use the new dst_entry 'next' pointer
  [IPV6]: Convert ipv6 route to use the new dst_entry 'next' pointer
  [IPV4]: Convert ipv4 route to use the new dst_entry 'next' pointer
  [NET]: Introduce union in struct dst_entry to hold 'next' pointer
  [DECNET]: fix misannotation of linkinfo_dn
  [DECNET]: FRA_{DST,SRC} are le16 for decnet
  [UDP]: UDP can use sk_hash to speedup lookups
  [NET]: Fix whitespace errors.
  [NET] XFRM: Fix whitespace errors.
  [NET] X25: Fix whitespace errors.
  [NET] WANROUTER: Fix whitespace errors.
  [NET] UNIX: Fix whitespace errors.
  [NET] TIPC: Fix whitespace errors.
  [NET] SUNRPC: Fix whitespace errors.
  [NET] SCTP: Fix whitespace errors.
  [NET] SCHED: Fix whitespace errors.
  [NET] RXRPC: Fix whitespace errors.
  ...
parents c827ba4c 5ef213f6

include/net/dn_route.h

+2 −3
Original line number Diff line number Diff line
@@ -68,9 +68,10 @@ extern void dn_rt_cache_flush(int delay); 
struct dn_route {

	union {

		struct dst_entry dst;

		struct dn_route *rt_next;

	} u;



	struct flowi fl;



	__le16 rt_saddr;

	__le16 rt_daddr;

	__le16 rt_gateway;
@@ -80,8 +81,6 @@ struct dn_route { 


	unsigned rt_flags;

	unsigned rt_type;



	struct flowi fl;

};



extern void dn_route_init(void);

include/net/dst.h

+10 −5
Original line number Diff line number Diff line
@@ -37,9 +37,7 @@ struct sk_buff; 


struct dst_entry

{

	struct dst_entry        *next;

	atomic_t		__refcnt;	/* client references	*/

	int			__use;

	struct rcu_head		rcu_head;

	struct dst_entry	*child;

	struct net_device       *dev;

	short			error;
@@ -50,7 +48,6 @@ struct dst_entry 
#define DST_NOPOLICY		4

#define DST_NOHASH		8

#define DST_BALANCED            0x10

	unsigned long		lastuse;

	unsigned long		expires;



	unsigned short		header_len;	/* more space at head required */
@@ -75,8 +72,16 @@ struct dst_entry 
#endif



	struct  dst_ops	        *ops;

	struct rcu_head		rcu_head;

		

	unsigned long		lastuse;

	atomic_t		__refcnt;	/* client references	*/

	int			__use;

	union {

		struct dst_entry *next;

		struct rtable    *rt_next;

		struct rt6_info   *rt6_next;

		struct dn_route  *dn_next;

	};

	char			info[0];

};

include/net/ip6_fib.h

+0 −1
Original line number Diff line number Diff line
@@ -83,7 +83,6 @@ struct rt6_info 
{

	union {

		struct dst_entry	dst;

		struct rt6_info		*next;

	} u;



	struct inet6_dev		*rt6i_idev;

include/net/route.h

+3 −4
Original line number Diff line number Diff line
@@ -53,9 +53,11 @@ struct rtable 
	union

	{

		struct dst_entry	dst;

		struct rtable		*rt_next;

	} u;



	/* Cache lookup keys */

	struct flowi		fl;



	struct in_device	*idev;

	

	unsigned		rt_flags;
@@ -69,9 +71,6 @@ struct rtable 
	/* Info on neighbour */

	__be32			rt_gateway;



	/* Cache lookup keys */

	struct flowi		fl;



	/* Miscellaneous cached information */

	__be32			rt_spec_dst; /* RFC1122 specific destination */

	struct inet_peer	*peer; /* long-living peer info */

net/decnet/dn_route.c

+102 −102
Original line number Diff line number Diff line
@@ -167,11 +167,11 @@ static void dn_dst_check_expire(unsigned long dummy) 
		while((rt=*rtp) != NULL) {

			if (atomic_read(&rt->u.dst.__refcnt) ||

					(now - rt->u.dst.lastuse) < expire) {

				rtp = &rt->u.rt_next;

				rtp = &rt->u.dst.dn_next;

				continue;

			}

			*rtp = rt->u.rt_next;

			rt->u.rt_next = NULL;

			*rtp = rt->u.dst.dn_next;

			rt->u.dst.dn_next = NULL;

			dnrt_free(rt);

		}

		spin_unlock(&dn_rt_hash_table[i].lock);
@@ -198,11 +198,11 @@ static int dn_dst_gc(void) 
		while((rt=*rtp) != NULL) {

			if (atomic_read(&rt->u.dst.__refcnt) ||

					(now - rt->u.dst.lastuse) < expire) {

				rtp = &rt->u.rt_next;

				rtp = &rt->u.dst.dn_next;

				continue;

			}

			*rtp = rt->u.rt_next;

			rt->u.rt_next = NULL;

			*rtp = rt->u.dst.dn_next;

			rt->u.dst.dn_next = NULL;

			dnrt_drop(rt);

			break;

		}
@@ -286,8 +286,8 @@ static int dn_insert_route(struct dn_route *rt, unsigned hash, struct dn_route * 
	while((rth = *rthp) != NULL) {

		if (compare_keys(&rth->fl, &rt->fl)) {

			/* Put it first */

			*rthp = rth->u.rt_next;

			rcu_assign_pointer(rth->u.rt_next,

			*rthp = rth->u.dst.dn_next;

			rcu_assign_pointer(rth->u.dst.dn_next,

					   dn_rt_hash_table[hash].chain);

			rcu_assign_pointer(dn_rt_hash_table[hash].chain, rth);
@@ -300,10 +300,10 @@ static int dn_insert_route(struct dn_route *rt, unsigned hash, struct dn_route * 
			*rp = rth;

			return 0;

		}

		rthp = &rth->u.rt_next;

		rthp = &rth->u.dst.dn_next;

	}



	rcu_assign_pointer(rt->u.rt_next, dn_rt_hash_table[hash].chain);

	rcu_assign_pointer(rt->u.dst.dn_next, dn_rt_hash_table[hash].chain);

	rcu_assign_pointer(dn_rt_hash_table[hash].chain, rt);



	dst_hold(&rt->u.dst);
@@ -326,8 +326,8 @@ void dn_run_flush(unsigned long dummy) 
			goto nothing_to_declare;



		for(; rt; rt=next) {

			next = rt->u.rt_next;

			rt->u.rt_next = NULL;

			next = rt->u.dst.dn_next;

			rt->u.dst.dn_next = NULL;

			dst_free((struct dst_entry *)rt);

		}
@@ -1169,7 +1169,7 @@ static int __dn_route_output_key(struct dst_entry **pprt, const struct flowi *fl 
	if (!(flags & MSG_TRYHARD)) {

		rcu_read_lock_bh();

		for(rt = rcu_dereference(dn_rt_hash_table[hash].chain); rt;

			rt = rcu_dereference(rt->u.rt_next)) {

			rt = rcu_dereference(rt->u.dst.dn_next)) {

			if ((flp->fld_dst == rt->fl.fld_dst) &&

			    (flp->fld_src == rt->fl.fld_src) &&

			    (flp->mark == rt->fl.mark) &&
@@ -1443,7 +1443,7 @@ int dn_route_input(struct sk_buff *skb) 


	rcu_read_lock();

	for(rt = rcu_dereference(dn_rt_hash_table[hash].chain); rt != NULL;

	    rt = rcu_dereference(rt->u.rt_next)) {

	    rt = rcu_dereference(rt->u.dst.dn_next)) {

		if ((rt->fl.fld_src == cb->src) &&

		    (rt->fl.fld_dst == cb->dst) &&

		    (rt->fl.oif == 0) &&
@@ -1627,7 +1627,7 @@ int dn_cache_dump(struct sk_buff *skb, struct netlink_callback *cb) 
		rcu_read_lock_bh();

		for(rt = rcu_dereference(dn_rt_hash_table[h].chain), idx = 0;

			rt;

			rt = rcu_dereference(rt->u.rt_next), idx++) {

			rt = rcu_dereference(rt->u.dst.dn_next), idx++) {

			if (idx < s_idx)

				continue;

			skb->dst = dst_clone(&rt->u.dst);
@@ -1673,7 +1673,7 @@ static struct dn_route *dn_rt_cache_get_next(struct seq_file *seq, struct dn_rou 
{

	struct dn_rt_cache_iter_state *s = rcu_dereference(seq->private);



	rt = rt->u.rt_next;

	rt = rt->u.dst.dn_next;

	while(!rt) {

		rcu_read_unlock_bh();

		if (--s->bucket < 0)