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

Conflicts:
	drivers/net/yellowfin.c

diff --cc drivers/net/Kconfig
Simple merge

diff --cc drivers/net/arm/w90p910_ether.c
Simple merge

diff --cc drivers/net/b44.c
Simple merge

diff --cc drivers/net/bnx2.c
Simple merge

diff --cc drivers/net/bnx2.h
Simple merge

diff --cc drivers/net/cnic.c
Simple merge

diff --cc drivers/net/e100.c
Simple merge

diff --cc drivers/net/e1000e/netdev.c
Simple merge

diff --cc drivers/net/gianfar.c
Simple merge

diff --cc drivers/net/ibm_newemac/core.c
Simple merge

diff --cc drivers/net/irda/au1k_ir.c
Simple merge

diff --cc drivers/net/irda/pxaficp_ir.c
Simple merge

diff --cc drivers/net/irda/sa1100_ir.c
Simple merge

diff --cc drivers/net/ixp2000/ixpdev.c
index 588b44d,92fb823..1272434
--- 1/drivers/net/ixp2000/ixpdev.c
--- 2/drivers/net/ixp2000/ixpdev.c
+++ b/drivers/net/ixp2000/ixpdev.c
@@@ -67,9 -68,9 +68,9 @@@ static int ixpdev_xmit(struct sk_buff *
        ip->tx_queue_entries++;
        if (ip->tx_queue_entries == TX_BUF_COUNT_PER_CHAN)
                netif_stop_queue(dev);
-       local_irq_enable();
+       local_irq_restore(flags);
  
 -      return 0;
 +      return NETDEV_TX_OK;
  }
  
  

diff --cc drivers/net/macb.c
Simple merge

diff --cc drivers/net/mlx4/en_tx.c
Simple merge

diff --cc drivers/net/smc91x.c
index 0f2c52c,7567f51..61be6d7
--- 1/drivers/net/smc91x.c
--- 2/drivers/net/smc91x.c
+++ b/drivers/net/smc91x.c
@@@ -655,10 -659,10 +659,10 @@@ static int smc_hard_start_xmit(struct s
                dev->stats.tx_errors++;
                dev->stats.tx_dropped++;
                dev_kfree_skb(skb);
 -              return 0;
 +              return NETDEV_TX_OK;
        }
  
-       smc_special_lock(&lp->lock);
+       smc_special_lock(&lp->lock, flags);
  
        /* now, try to allocate the memory */
        SMC_SET_MMU_CMD(lp, MC_ALLOC | numPages);

diff --cc drivers/net/tulip/tulip_core.c
Simple merge

diff --cc drivers/net/ucc_geth.c
index 7fb96f3,8a7b8c7..3b647d0
--- 1/drivers/net/ucc_geth.c
--- 2/drivers/net/ucc_geth.c
+++ b/drivers/net/ucc_geth.c
@@@ -3144,9 -3172,9 +3145,9 @@@ static int ucc_geth_start_xmit(struct s
        uccf = ugeth->uccf;
        out_be16(uccf->p_utodr, UCC_FAST_TOD);
  #endif
-       spin_unlock_irq(&ugeth->lock);
+       spin_unlock_irqrestore(&ugeth->lock, flags);
  
 -      return 0;
 +      return NETDEV_TX_OK;
  }
  
  static int ucc_geth_rx(struct ucc_geth_private *ugeth, u8 rxQ, int rx_work_limit)

diff --cc drivers/net/via-rhine.c
Simple merge

diff --cc drivers/net/via-velocity.c
Simple merge

diff --cc drivers/net/virtio_net.c
Simple merge

diff --cc drivers/net/wireless/ipw2x00/ipw2200.c
Simple merge

diff --cc drivers/net/wireless/orinoco/hw.c
index 40d8dfa,b394627..359652d
--- 1/drivers/net/wireless/orinoco/hw.c
--- 2/drivers/net/wireless/orinoco/hw.c
+++ b/drivers/net/wireless/orinoco/hw.c
@@@ -642,9 -68,9 +642,9 @@@ int orinoco_hw_get_tkip_iv(struct orino
  {
        hermes_t *hw = &priv->hw;
        int err = 0;
 -      u8 tsc_arr[4][IW_ENCODE_SEQ_MAX_SIZE];
 +      u8 tsc_arr[4][ORINOCO_SEQ_LEN];
  
-       if ((key < 0) || (key > 4))
+       if ((key < 0) || (key >= 4))
                return -EINVAL;
  
        err = hermes_read_ltv(hw, USER_BAP, HERMES_RID_CURRENT_TKIP_IV,

diff --cc drivers/net/wireless/rtl818x/rtl8187_dev.c
Simple merge

diff --cc drivers/net/yellowfin.c
index 9509477,c2fd618..4987040
--- 1/drivers/net/yellowfin.c
--- 2/drivers/net/yellowfin.c
+++ b/drivers/net/yellowfin.c
@@@ -346,9 -346,8 +346,9 @@@ static int netdev_ioctl(struct net_devi
  static int yellowfin_open(struct net_device *dev);
  static void yellowfin_timer(unsigned long data);
  static void yellowfin_tx_timeout(struct net_device *dev);
- static void yellowfin_init_ring(struct net_device *dev);
+ static int yellowfin_init_ring(struct net_device *dev);
 -static int yellowfin_start_xmit(struct sk_buff *skb, struct net_device *dev);
 +static netdev_tx_t yellowfin_start_xmit(struct sk_buff *skb,
 +                                      struct net_device *dev);
  static irqreturn_t yellowfin_interrupt(int irq, void *dev_instance);
  static int yellowfin_rx(struct net_device *dev);
  static void yellowfin_error(struct net_device *dev, int intr_status);
@@@ -806,11 -813,10 +814,11 @@@ static int yellowfin_init_ring(struct n
  }
  #endif
        yp->tx_tail_desc = &yp->tx_status[0];
-       return;
+       return 0;
  }
  
 -static int yellowfin_start_xmit(struct sk_buff *skb, struct net_device *dev)
 +static netdev_tx_t yellowfin_start_xmit(struct sk_buff *skb,
 +                                      struct net_device *dev)
  {
        struct yellowfin_private *yp = netdev_priv(dev);
        unsigned entry;

diff --cc include/net/sch_generic.h
Simple merge

diff --cc net/core/netpoll.c
Simple merge

diff --cc net/core/sock.c
Simple merge

diff --cc net/ipv4/ip_gre.c
Simple merge

diff --cc net/ipv6/af_inet6.c
Simple merge