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

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

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

Conflicts:

	drivers/net/usb/rndis_host.c
	drivers/net/wireless/b43/dma.c
	net/ipv6/ndisc.c
parents ed85f2c3 50fd4407

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -2101,7 +2101,7 @@ M: reinette.chatre@intel.com 
L:	linux-wireless@vger.kernel.org

L:	ipw3945-devel@lists.sourceforge.net

W:	http://intellinuxwireless.org

T:	git git://intellinuxwireless.org/repos/iwlwifi

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/rchatre/iwlwifi-2.6.git

S:	Supported



IOC3 ETHERNET DRIVER

arch/um/drivers/net_kern.c

+1 −5
Original line number Diff line number Diff line
@@ -256,11 +256,7 @@ static struct net_device_stats *uml_net_get_stats(struct net_device *dev) 


static void uml_net_set_multicast_list(struct net_device *dev)

{

	if (dev->flags & IFF_PROMISC)

	return;

	else if (dev->mc_count)

		dev->flags |= IFF_ALLMULTI;

	else dev->flags &= ~IFF_ALLMULTI;

}



static void uml_net_tx_timeout(struct net_device *dev)

drivers/net/b44.c

+5 −0
Original line number Diff line number Diff line
@@ -2082,6 +2082,11 @@ static int __devinit b44_get_invariants(struct b44 *bp) 
		addr = sdev->bus->sprom.et0mac;

		bp->phy_addr = sdev->bus->sprom.et0phyaddr;

	}

	/* Some ROMs have buggy PHY addresses with the high

	 * bits set (sign extension?). Truncate them to a

	 * valid PHY address. */

	bp->phy_addr &= 0x1F;



	memcpy(bp->dev->dev_addr, addr, 6);



	if (!is_valid_ether_addr(&bp->dev->dev_addr[0])){

drivers/net/bonding/bond_3ad.c

+2 −2
Original line number Diff line number Diff line
@@ -310,7 +310,7 @@ static inline int __check_agg_selection_timer(struct port *port) 
 */

static inline void __get_rx_machine_lock(struct port *port)

{

	spin_lock(&(SLAVE_AD_INFO(port->slave).rx_machine_lock));

	spin_lock_bh(&(SLAVE_AD_INFO(port->slave).rx_machine_lock));

}



/**
@@ -320,7 +320,7 @@ static inline void __get_rx_machine_lock(struct port *port) 
 */

static inline void __release_rx_machine_lock(struct port *port)

{

	spin_unlock(&(SLAVE_AD_INFO(port->slave).rx_machine_lock));

	spin_unlock_bh(&(SLAVE_AD_INFO(port->slave).rx_machine_lock));

}



/**

drivers/net/bonding/bond_alb.c

+1 −5
Original line number Diff line number Diff line
@@ -678,12 +678,8 @@ static struct slave *rlb_choose_channel(struct sk_buff *skb, struct bonding *bon 
		}



		if (!list_empty(&bond->vlan_list)) {

			unsigned short vlan_id;

			int res = vlan_get_tag(skb, &vlan_id);

			if (!res) {

			if (!vlan_get_tag(skb, &client_info->vlan_id))

				client_info->tag = 1;

				client_info->vlan_id = vlan_id;

			}

		}



		if (!client_info->assigned) {