From: David S. Miller <davem@davemloft.net>
Date: Wed, 14 Apr 2010 12:01:33 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v3.12-rc1~10278^2~468
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dad1e54b121d93ed47690d77736af63d3f11d657;p=kernel%2Fkernel-generic.git

Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:
	drivers/net/pcmcia/smc91c92_cs.c
	drivers/net/virtio_net.c
---

dad1e54b121d93ed47690d77736af63d3f11d657
diff --cc drivers/net/pcmcia/smc91c92_cs.c
index ad22676,fd9d6e3..408f3d7
--- a/drivers/net/pcmcia/smc91c92_cs.c
+++ b/drivers/net/pcmcia/smc91c92_cs.c
@@@ -1618,14 -1621,10 +1621,10 @@@ static void set_rx_mode(struct net_devi
  	rx_cfg_setting = RxStripCRC | RxEnable | RxAllMulti;
      else {
  	if (!netdev_mc_empty(dev)) {
 -	    struct dev_mc_list *mc_addr;
 +	    struct netdev_hw_addr *ha;
  
 -	    netdev_for_each_mc_addr(mc_addr, dev) {
 -		u_int position = ether_crc(6, mc_addr->dmi_addr);
 +	    netdev_for_each_mc_addr(ha, dev) {
 +		u_int position = ether_crc(6, ha->addr);
- #ifndef final_version		/* Verify multicast address. */
- 		if ((ha->addr[0] & 1) == 0)
- 		    continue;
- #endif
  		multicast_table[position >> 29] |= 1 << ((position >> 26) & 7);
  	    }
  	}
diff --cc drivers/net/virtio_net.c
index b0a85d0,b0577dd..7311651
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@@ -327,8 -324,10 +327,9 @@@ static int add_recvbuf_small(struct vir
  {
  	struct sk_buff *skb;
  	struct skb_vnet_hdr *hdr;
 -	struct scatterlist sg[2];
  	int err;
  
+ 	sg_init_table(sg, 2);
  	skb = netdev_alloc_skb_ip_align(vi->dev, MAX_PACKET_LEN);
  	if (unlikely(!skb))
  		return -ENOMEM;