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

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

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 



Conflicts:
	drivers/net/ethernet/broadcom/tg3.c

Conflicts in the statistics regression bug fix from 'net',
but happily Matt Carlson originally posted the fix against
'net-next' so I used that to resolve this.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 97767a87 413708bb

drivers/net/ethernet/broadcom/tg3.c

+22 −21
Original line number Diff line number Diff line
@@ -8001,10 +8001,8 @@ static int tg3_chip_reset(struct tg3 *tp) 
	return 0;

}



static struct rtnl_link_stats64 *tg3_get_stats64(struct net_device *,

						 struct rtnl_link_stats64 *);

static struct tg3_ethtool_stats *tg3_get_estats(struct tg3 *,

						struct tg3_ethtool_stats *);

static void tg3_get_nstats(struct tg3 *, struct rtnl_link_stats64 *);

static void tg3_get_estats(struct tg3 *, struct tg3_ethtool_stats *);



/* tp->lock is held. */

static int tg3_halt(struct tg3 *tp, int kind, int silent)
@@ -8025,7 +8023,7 @@ static int tg3_halt(struct tg3 *tp, int kind, int silent) 


	if (tp->hw_stats) {

		/* Save the stats across chip resets... */

		tg3_get_stats64(tp->dev, &tp->net_stats_prev),

		tg3_get_nstats(tp, &tp->net_stats_prev);

		tg3_get_estats(tp, &tp->estats_prev);



		/* And make sure the next sample is new data */
@@ -10125,7 +10123,7 @@ static inline u64 get_stat64(tg3_stat64_t *val) 
       return ((u64)val->high << 32) | ((u64)val->low);

}



static u64 calc_crc_errors(struct tg3 *tp)

static u64 tg3_calc_crc_errors(struct tg3 *tp)

{

	struct tg3_hw_stats *hw_stats = tp->hw_stats;
@@ -10134,14 +10132,12 @@ static u64 calc_crc_errors(struct tg3 *tp) 
	     GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5701)) {

		u32 val;



		spin_lock_bh(&tp->lock);

		if (!tg3_readphy(tp, MII_TG3_TEST1, &val)) {

			tg3_writephy(tp, MII_TG3_TEST1,

				     val | MII_TG3_TEST1_CRC_EN);

			tg3_readphy(tp, MII_TG3_RXR_COUNTERS, &val);

		} else

			val = 0;

		spin_unlock_bh(&tp->lock);



		tp->phy_crc_errors += val;
@@ -10155,8 +10151,7 @@ static u64 calc_crc_errors(struct tg3 *tp) 
	estats->member =	old_estats->member + \

				get_stat64(&hw_stats->member)



static struct tg3_ethtool_stats *tg3_get_estats(struct tg3 *tp,

					       struct tg3_ethtool_stats *estats)

static void tg3_get_estats(struct tg3 *tp, struct tg3_ethtool_stats *estats)

{

	struct tg3_ethtool_stats *old_estats = &tp->estats_prev;

	struct tg3_hw_stats *hw_stats = tp->hw_stats;
@@ -10238,20 +10233,13 @@ static struct tg3_ethtool_stats *tg3_get_estats(struct tg3 *tp, 
	ESTAT_ADD(nic_tx_threshold_hit);



	ESTAT_ADD(mbuf_lwm_thresh_hit);



	return estats;

}



static struct rtnl_link_stats64 *tg3_get_stats64(struct net_device *dev,

						 struct rtnl_link_stats64 *stats)

static void tg3_get_nstats(struct tg3 *tp, struct rtnl_link_stats64 *stats)

{

	struct tg3 *tp = netdev_priv(dev);

	struct rtnl_link_stats64 *old_stats = &tp->net_stats_prev;

	struct tg3_hw_stats *hw_stats = tp->hw_stats;



	if (!hw_stats)

		return old_stats;



	stats->rx_packets = old_stats->rx_packets +

		get_stat64(&hw_stats->rx_ucast_packets) +

		get_stat64(&hw_stats->rx_mcast_packets) +
@@ -10294,15 +10282,13 @@ static struct rtnl_link_stats64 *tg3_get_stats64(struct net_device *dev, 
		get_stat64(&hw_stats->tx_carrier_sense_errors);



	stats->rx_crc_errors = old_stats->rx_crc_errors +

		calc_crc_errors(tp);

		tg3_calc_crc_errors(tp);



	stats->rx_missed_errors = old_stats->rx_missed_errors +

		get_stat64(&hw_stats->rx_discards);



	stats->rx_dropped = tp->rx_dropped;

	stats->tx_dropped = tp->tx_dropped;



	return stats;

}



static int tg3_get_regs_len(struct net_device *dev)
@@ -12213,6 +12199,21 @@ static const struct ethtool_ops tg3_ethtool_ops = { 
	.set_rxfh_indir		= tg3_set_rxfh_indir,

};



static struct rtnl_link_stats64 *tg3_get_stats64(struct net_device *dev,

						struct rtnl_link_stats64 *stats)

{

	struct tg3 *tp = netdev_priv(dev);



	if (!tp->hw_stats)

		return &tp->net_stats_prev;



	spin_lock_bh(&tp->lock);

	tg3_get_nstats(tp, stats);

	spin_unlock_bh(&tp->lock);



	return stats;

}



static void tg3_set_rx_mode(struct net_device *dev)

{

	struct tg3 *tp = netdev_priv(dev);

drivers/net/ethernet/cisco/enic/enic.h

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ struct enic { 
	u32 rx_coalesce_usecs;

	u32 tx_coalesce_usecs;

#ifdef CONFIG_PCI_IOV

	u32 num_vfs;

	u16 num_vfs;

#endif

	struct enic_port_profile *pp;

drivers/net/ethernet/cisco/enic/enic_main.c

+1 −1
Original line number Diff line number Diff line
@@ -2390,7 +2390,7 @@ static int __devinit enic_probe(struct pci_dev *pdev, 
	pos = pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_SRIOV);

	if (pos) {

		pci_read_config_word(pdev, pos + PCI_SRIOV_TOTAL_VF,

			(u16 *)&enic->num_vfs);

			&enic->num_vfs);

		if (enic->num_vfs) {

			err = pci_enable_sriov(pdev, enic->num_vfs);

			if (err) {

drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c

+8 −7
Original line number Diff line number Diff line
@@ -321,10 +321,10 @@ static void pch_gbe_check_copper_options(struct pch_gbe_adapter *adapter) 
			pr_debug("AutoNeg specified along with Speed or Duplex, AutoNeg parameter ignored\n");

			hw->phy.autoneg_advertised = opt.def;

		} else {

			hw->phy.autoneg_advertised = AutoNeg;

			pch_gbe_validate_option(

				(int *)(&hw->phy.autoneg_advertised),

				&opt, adapter);

			int tmp = AutoNeg;



			pch_gbe_validate_option(&tmp, &opt, adapter);

			hw->phy.autoneg_advertised = tmp;

		}

	}
@@ -495,9 +495,10 @@ void pch_gbe_check_options(struct pch_gbe_adapter *adapter) 
			.arg  = { .l = { .nr = (int)ARRAY_SIZE(fc_list),

					 .p = fc_list } }

		};

		hw->mac.fc = FlowControl;

		pch_gbe_validate_option((int *)(&hw->mac.fc),

						&opt, adapter);

		int tmp = FlowControl;



		pch_gbe_validate_option(&tmp, &opt, adapter);

		hw->mac.fc = tmp;

	}



	pch_gbe_check_copper_options(adapter);

drivers/net/wireless/ath/ath9k/ar5008_phy.c

+1 −24
Original line number Diff line number Diff line
@@ -489,8 +489,6 @@ static int ar5008_hw_rf_alloc_ext_banks(struct ath_hw *ah) 
	ATH_ALLOC_BANK(ah->analogBank6Data, ah->iniBank6.ia_rows);

	ATH_ALLOC_BANK(ah->analogBank6TPCData, ah->iniBank6TPC.ia_rows);

	ATH_ALLOC_BANK(ah->analogBank7Data, ah->iniBank7.ia_rows);

	ATH_ALLOC_BANK(ah->addac5416_21,

		       ah->iniAddac.ia_rows * ah->iniAddac.ia_columns);

	ATH_ALLOC_BANK(ah->bank6Temp, ah->iniBank6.ia_rows);



	return 0;
@@ -519,7 +517,6 @@ static void ar5008_hw_rf_free_ext_banks(struct ath_hw *ah) 
	ATH_FREE_BANK(ah->analogBank6Data);

	ATH_FREE_BANK(ah->analogBank6TPCData);

	ATH_FREE_BANK(ah->analogBank7Data);

	ATH_FREE_BANK(ah->addac5416_21);

	ATH_FREE_BANK(ah->bank6Temp);



#undef ATH_FREE_BANK
@@ -805,27 +802,7 @@ static int ar5008_hw_process_ini(struct ath_hw *ah, 
	if (ah->eep_ops->set_addac)

		ah->eep_ops->set_addac(ah, chan);



	if (AR_SREV_5416_22_OR_LATER(ah)) {

	REG_WRITE_ARRAY(&ah->iniAddac, 1, regWrites);

	} else {

		struct ar5416IniArray temp;

		u32 addacSize =

			sizeof(u32) * ah->iniAddac.ia_rows *

			ah->iniAddac.ia_columns;



		/* For AR5416 2.0/2.1 */

		memcpy(ah->addac5416_21,

		       ah->iniAddac.ia_array, addacSize);



		/* override CLKDRV value at [row, column] = [31, 1] */

		(ah->addac5416_21)[31 * ah->iniAddac.ia_columns + 1] = 0;



		temp.ia_array = ah->addac5416_21;

		temp.ia_columns = ah->iniAddac.ia_columns;

		temp.ia_rows = ah->iniAddac.ia_rows;

		REG_WRITE_ARRAY(&temp, 1, regWrites);

	}



	REG_WRITE(ah, AR_PHY_ADC_SERIAL_CTL, AR_PHY_SEL_INTERNAL_ADDAC);



	ENABLE_REGWRITE_BUFFER(ah);