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

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

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

parents adb9c9ac 35eaa31e

drivers/net/ifb.c

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ struct ifb_private { 
	struct sk_buff_head     tq;

};



static int numifbs = 1;

static int numifbs = 2;



static void ri_tasklet(unsigned long dev);

static int ifb_xmit(struct sk_buff *skb, struct net_device *dev);

include/net/xfrm.h

+5 −0
Original line number Diff line number Diff line
@@ -403,6 +403,11 @@ unsigned xfrm_spi_hash(xfrm_address_t *addr, u32 spi, u8 proto, unsigned short f 


extern void __xfrm_state_destroy(struct xfrm_state *);



static inline void __xfrm_state_put(struct xfrm_state *x)

{

	atomic_dec(&x->refcnt);

}



static inline void xfrm_state_put(struct xfrm_state *x)

{

	if (atomic_dec_and_test(&x->refcnt))

net/bridge/br_netfilter.c

+1 −0
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ static struct rtable __fake_rtable = { 
			.dev			= &__fake_net_device,

			.path			= &__fake_rtable.u.dst,

			.metrics		= {[RTAX_MTU - 1] = 1500},

			.flags			= DST_NOXFRM,

		}

	},

	.rt_flags	= 0,

net/ethernet/eth.c

+6 −6
Original line number Diff line number Diff line
@@ -95,6 +95,12 @@ int eth_header(struct sk_buff *skb, struct net_device *dev, unsigned short type, 
		saddr = dev->dev_addr;

	memcpy(eth->h_source,saddr,dev->addr_len);



	if(daddr)

	{

		memcpy(eth->h_dest,daddr,dev->addr_len);

		return ETH_HLEN;

	}

	

	/*

	 *	Anyway, the loopback-device should never use this function... 

	 */
@@ -105,12 +111,6 @@ int eth_header(struct sk_buff *skb, struct net_device *dev, unsigned short type, 
		return ETH_HLEN;

	}

	

	if(daddr)

	{

		memcpy(eth->h_dest,daddr,dev->addr_len);

		return ETH_HLEN;

	}

	

	return -ETH_HLEN;

}

net/ipv4/route.c

+1 −1
Original line number Diff line number Diff line
@@ -835,7 +835,7 @@ static int rt_garbage_collect(void) 
					int r;



					rthp = rt_remove_balanced_route(

						&rt_hash_table[i].chain,

						&rt_hash_table[k].chain,

						rth,

						&r);

					goal -= r;