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

Commit da812035 authored by David S. Miller's avatar David S. Miller
Browse files

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

Conflicts:
	drivers/net/wireless/orinoco/main.c
parents c86ae826 7fefe6a8

Documentation/RCU/rculist_nulls.txt

+6 −1
Original line number Diff line number Diff line
@@ -83,11 +83,12 @@ not detect it missed following items in original chain. 
obj = kmem_cache_alloc(...);

lock_chain(); // typically a spin_lock()

obj->key = key;

atomic_inc(&obj->refcnt);

/*

 * we need to make sure obj->key is updated before obj->next

 * or obj->refcnt

 */

smp_wmb();

atomic_set(&obj->refcnt, 1);

hlist_add_head_rcu(&obj->obj_node, list);

unlock_chain(); // typically a spin_unlock()
@@ -159,6 +160,10 @@ out: 
obj = kmem_cache_alloc(cachep);

lock_chain(); // typically a spin_lock()

obj->key = key;

/*

 * changes to obj->key must be visible before refcnt one

 */

smp_wmb();

atomic_set(&obj->refcnt, 1);

/*

 * insert obj in RCU way (readers might be traversing chain)

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -4089,6 +4089,7 @@ L: netfilter@vger.kernel.org 
L:	coreteam@netfilter.org

W:	http://www.netfilter.org/

W:	http://www.iptables.org/

T:	git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6.git

S:	Supported

F:	include/linux/netfilter*

F:	include/linux/netfilter/

drivers/net/8139too.c

+1 −0
Original line number Diff line number Diff line
@@ -908,6 +908,7 @@ static const struct net_device_ops rtl8139_netdev_ops = { 
	.ndo_open		= rtl8139_open,

	.ndo_stop		= rtl8139_close,

	.ndo_get_stats		= rtl8139_get_stats,

	.ndo_change_mtu		= eth_change_mtu,

	.ndo_validate_addr	= eth_validate_addr,

	.ndo_set_mac_address 	= rtl8139_set_mac_address,

	.ndo_start_xmit		= rtl8139_start_xmit,

drivers/net/arm/ixp4xx_eth.c

+3 −1
Original line number Diff line number Diff line
@@ -1142,7 +1142,9 @@ static const struct net_device_ops ixp4xx_netdev_ops = { 
	.ndo_start_xmit = eth_xmit,

	.ndo_set_multicast_list = eth_set_mcast_list,

	.ndo_do_ioctl = eth_ioctl,



	.ndo_change_mtu = eth_change_mtu,

	.ndo_set_mac_address = eth_mac_addr,

	.ndo_validate_addr = eth_validate_addr,

};



static int __devinit eth_init_one(struct platform_device *pdev)

drivers/net/atl1c/atl1c.h

+4 −4
Original line number Diff line number Diff line
@@ -188,14 +188,14 @@ struct atl1c_tpd_ext_desc { 
#define RRS_HDS_TYPE_DATA	2



#define RRS_IS_NO_HDS_TYPE(flag) \

	(((flag) >> (RRS_HDS_TYPE_SHIFT)) & RRS_HDS_TYPE_MASK == 0)

	((((flag) >> (RRS_HDS_TYPE_SHIFT)) & RRS_HDS_TYPE_MASK) == 0)



#define RRS_IS_HDS_HEAD(flag) \

	(((flag) >> (RRS_HDS_TYPE_SHIFT)) & RRS_HDS_TYPE_MASK == \

	((((flag) >> (RRS_HDS_TYPE_SHIFT)) & RRS_HDS_TYPE_MASK) == \

			RRS_HDS_TYPE_HEAD)



#define RRS_IS_HDS_DATA(flag) \

	(((flag) >> (RRS_HDS_TYPE_SHIFT)) & RRS_HDS_TYPE_MASK == \

	((((flag) >> (RRS_HDS_TYPE_SHIFT)) & RRS_HDS_TYPE_MASK) == \

			RRS_HDS_TYPE_DATA)



/* rrs word 3 bit 0:31 */
@@ -245,7 +245,7 @@ struct atl1c_tpd_ext_desc { 
#define RRS_PACKET_TYPE_802_3  	1

#define RRS_PACKET_TYPE_ETH	0

#define RRS_PACKET_IS_ETH(word) \

	(((word) >> RRS_PACKET_TYPE_SHIFT) & RRS_PACKET_TYPE_MASK == \

	((((word) >> RRS_PACKET_TYPE_SHIFT) & RRS_PACKET_TYPE_MASK) == \

			RRS_PACKET_TYPE_ETH)

#define RRS_RXD_IS_VALID(word) \

	((((word) >> RRS_RXD_UPDATED_SHIFT) & RRS_RXD_UPDATED_MASK) == 1)