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

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

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

parents a4056573 208aefa2

drivers/net/fec_mpc52xx.c

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ module_param_array_named(mac, mpc52xx_fec_mac_addr, byte, NULL, 0); 
MODULE_PARM_DESC(mac, "six hex digits, ie. 0x1,0x2,0xc0,0x01,0xba,0xbe");



#define MPC52xx_MESSAGES_DEFAULT ( NETIF_MSG_DRV | NETIF_MSG_PROBE | \

		NETIF_MSG_LINK | NETIF_MSG_IFDOWN | NETIF_MSG_IFDOWN )

		NETIF_MSG_LINK | NETIF_MSG_IFDOWN | NETIF_MSG_IFUP)

static int debug = -1;	/* the above default */

module_param(debug, int, 0);

MODULE_PARM_DESC(debug, "debugging messages level");

drivers/net/ipg.c

+2 −2
Original line number Diff line number Diff line
@@ -577,12 +577,12 @@ static void ipg_nic_set_multicast_list(struct net_device *dev) 
		/* NIC to be configured in promiscuous mode. */

		receivemode = IPG_RM_RECEIVEALLFRAMES;

	} else if ((dev->flags & IFF_ALLMULTI) ||

		   (dev->flags & IFF_MULTICAST &

		   ((dev->flags & IFF_MULTICAST) &&

		    (dev->mc_count > IPG_MULTICAST_HASHTABLE_SIZE))) {

		/* NIC to be configured to receive all multicast

		 * frames. */

		receivemode |= IPG_RM_RECEIVEMULTICAST;

	} else if (dev->flags & IFF_MULTICAST & (dev->mc_count > 0)) {

	} else if ((dev->flags & IFF_MULTICAST) && (dev->mc_count > 0)) {

		/* NIC to be configured to receive selected

		 * multicast addresses. */

		receivemode |= IPG_RM_RECEIVEMULTICASTHASH;

drivers/net/r6040.c

+1 −1
Original line number Diff line number Diff line
@@ -733,7 +733,7 @@ static void r6040_timer(unsigned long data) 
	}



	/* Timer active again */

	mod_timer(&lp->timer, jiffies + round_jiffies(HZ));

	mod_timer(&lp->timer, round_jiffies(jiffies + HZ));

}



/* Read/set MAC address routines */