From: David S. Miller <davem@davemloft.net>
Date: Wed, 2 Sep 2009 07:32:56 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6cdee2f96a97f6da26bd3759c3f8823332fbb438;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

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

Conflicts:
	drivers/net/yellowfin.c
---

6cdee2f96a97f6da26bd3759c3f8823332fbb438
diff --cc drivers/net/ixp2000/ixpdev.c
index 588b44d944ce,92fb8235c766..127243461a51
--- a/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/smc91x.c
index 0f2c52c2e044,7567f510eff5..61be6d7680f6
--- a/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/ucc_geth.c
index 7fb96f33bade,8a7b8c7bd781..3b647d07e410
--- a/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/wireless/orinoco/hw.c
index 40d8dfa7eace,b3946272c72e..359652d35e63
--- a/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/yellowfin.c
index 9509477f61f4,c2fd6187773f..4987040c414b
--- a/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;