From: David S. Miller <davem@davemloft.net>
Date: Tue, 17 May 2011 21:33:11 +0000 (-0400)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: upstream/snapshot3+hdmi~10386^2~48
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9cbc94eabb0791906051bbfac024ef2c2be8e079;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

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

Conflicts:
	drivers/net/vmxnet3/vmxnet3_ethtool.c
	net/core/dev.c
---

9cbc94eabb0791906051bbfac024ef2c2be8e079
diff --cc drivers/net/vmxnet3/vmxnet3_ethtool.c
index 64303eb,9764672..dc959fe
--- a/drivers/net/vmxnet3/vmxnet3_ethtool.c
+++ b/drivers/net/vmxnet3/vmxnet3_ethtool.c
@@@ -262,21 -296,26 +262,22 @@@ vmxnet3_get_strings(struct net_device *
  	}
  }
  
 -static int
 -vmxnet3_set_flags(struct net_device *netdev, u32 data)
 +int vmxnet3_set_features(struct net_device *netdev, u32 features)
  {
  	struct vmxnet3_adapter *adapter = netdev_priv(netdev);
 -	u8 lro_requested = (data & ETH_FLAG_LRO) == 0 ? 0 : 1;
 -	u8 lro_present = (netdev->features & NETIF_F_LRO) == 0 ? 0 : 1;
  	unsigned long flags;
 +	u32 changed = features ^ netdev->features;
  
 -	if (ethtool_invalid_flags(netdev, data, ETH_FLAG_LRO))
 -		return -EINVAL;
 -
 -	if (lro_requested ^ lro_present) {
 -		/* toggle the LRO feature*/
 -		netdev->features ^= NETIF_F_LRO;
 -
 -		/* Update private LRO flag */
 -		adapter->lro = lro_requested;
 +	if (changed & (NETIF_F_RXCSUM|NETIF_F_LRO)) {
 +		if (features & NETIF_F_RXCSUM)
 +			adapter->shared->devRead.misc.uptFeatures |=
 +			UPT1_F_RXCSUM;
 +		else
 +			adapter->shared->devRead.misc.uptFeatures &=
 +			~UPT1_F_RXCSUM;
  
+ 		/* update harware LRO capability accordingly */
 -		if (lro_requested)
 +		if (features & NETIF_F_LRO)
  			adapter->shared->devRead.misc.uptFeatures |=
  							UPT1_F_LRO;
  		else
diff --cc drivers/net/wireless/ath/ath9k/main.c
index 45303bdb,1482fa6..17ebdf1
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@@ -2265,13 -2141,22 +2265,21 @@@ static void ath9k_set_coverage_class(st
  static void ath9k_flush(struct ieee80211_hw *hw, bool drop)
  {
  	struct ath_softc *sc = hw->priv;
+ 	struct ath_hw *ah = sc->sc_ah;
+ 	struct ath_common *common = ath9k_hw_common(ah);
  	int timeout = 200; /* ms */
  	int i, j;
 +	bool drain_txq;
  
 -	ath9k_ps_wakeup(sc);
  	mutex_lock(&sc->mutex);
 -
  	cancel_delayed_work_sync(&sc->tx_complete_work);
  
+ 	if (sc->sc_flags & SC_OP_INVALID) {
+ 		ath_dbg(common, ATH_DBG_ANY, "Device not present\n");
+ 		mutex_unlock(&sc->mutex);
+ 		return;
+ 	}
+ 
  	if (drop)
  		timeout = 1;
  
diff --cc net/core/dev.c
index 3ed09f8,acd7423..155de20
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@@ -5268,9 -5256,9 +5268,9 @@@ int __netdev_update_features(struct net
  	features = netdev_fix_features(dev, features);
  
  	if (dev->features == features)
 -		return;
 +		return 0;
  
- 	netdev_info(dev, "Features changed: 0x%08x -> 0x%08x\n",
+ 	netdev_dbg(dev, "Features changed: 0x%08x -> 0x%08x\n",
  		dev->features, features);
  
  	if (dev->netdev_ops->ndo_set_features)
@@@ -5462,20 -5414,6 +5462,14 @@@ int register_netdevice(struct net_devic
  	dev->features |= NETIF_F_SOFT_FEATURES;
  	dev->wanted_features = dev->features & dev->hw_features;
  
- 	/* Avoid warning from netdev_fix_features() for GSO without SG */
- 	if (!(dev->wanted_features & NETIF_F_SG)) {
- 		dev->wanted_features &= ~NETIF_F_GSO;
- 		dev->features &= ~NETIF_F_GSO;
- 	}
- 
 +	/* Turn on no cache copy if HW is doing checksum */
 +	dev->hw_features |= NETIF_F_NOCACHE_COPY;
 +	if ((dev->features & NETIF_F_ALL_CSUM) &&
 +	    !(dev->features & NETIF_F_NO_CSUM)) {
 +		dev->wanted_features |= NETIF_F_NOCACHE_COPY;
 +		dev->features |= NETIF_F_NOCACHE_COPY;
 +	}
 +
  	/* Enable GRO and NETIF_F_HIGHDMA for vlans by default,
  	 * vlan_dev_init() will do the dev->features check, so these features
  	 * are enabled only if supported by underlying device.
diff --cc net/netfilter/ipvs/ip_vs_ctl.c
index 89842f0,37890f2..699c79a
--- a/net/netfilter/ipvs/ip_vs_ctl.c
+++ b/net/netfilter/ipvs/ip_vs_ctl.c
@@@ -2066,9 -2066,12 +2066,9 @@@ static const struct file_operations ip_
  	.open    = ip_vs_info_open,
  	.read    = seq_read,
  	.llseek  = seq_lseek,
- 	.release = seq_release_private,
+ 	.release = seq_release_net,
  };
  
 -#endif
 -
 -#ifdef CONFIG_PROC_FS
  static int ip_vs_stats_show(struct seq_file *seq, void *v)
  {
  	struct net *net = seq_file_single_net(seq);