Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (b26e478f) · Commits · e / devices / android_kernel_sony_msm8998

drivers/net/ethernet/freescale/fec.c

+7 −4

Original line number	Original line	Diff line number	Diff line
	@@ -232,6 +232,7 @@ struct fec_enet_private {
	struct platform_device *pdev;		struct platform_device *pdev;

	int opened;		int opened;
			int dev_id;

	/* Phylib and MDIO interface */		/* Phylib and MDIO interface */
	struct mii_bus *mii_bus;		struct mii_bus *mii_bus;
	@@ -842,7 +843,7 @@ static void __inline__ fec_get_mac(struct net_device *ndev)

	/* Adjust MAC if using macaddr */		/* Adjust MAC if using macaddr */
	if (iap == macaddr)		if (iap == macaddr)
	ndev->dev_addr[ETH_ALEN-1] = macaddr[ETH_ALEN-1] + fep->pdev->id;		ndev->dev_addr[ETH_ALEN-1] = macaddr[ETH_ALEN-1] + fep->dev_id;
	}		}

	/* ------------------------------------------------------------------------- */		/* ------------------------------------------------------------------------- */
	@@ -960,7 +961,7 @@ static int fec_enet_mii_probe(struct net_device *ndev)
	char mdio_bus_id[MII_BUS_ID_SIZE];		char mdio_bus_id[MII_BUS_ID_SIZE];
	char phy_name[MII_BUS_ID_SIZE + 3];		char phy_name[MII_BUS_ID_SIZE + 3];
	int phy_id;		int phy_id;
	int dev_id = fep->pdev->id;		int dev_id = fep->dev_id;

	fep->phy_dev = NULL;		fep->phy_dev = NULL;

	@@ -1040,7 +1041,7 @@ static int fec_enet_mii_init(struct platform_device *pdev)
	* mdio interface in board design, and need to be configured by		* mdio interface in board design, and need to be configured by
	* fec0 mii_bus.		* fec0 mii_bus.
	*/		*/
	if ((id_entry->driver_data & FEC_QUIRK_ENET_MAC) && pdev->id > 0) {		if ((id_entry->driver_data & FEC_QUIRK_ENET_MAC) && fep->dev_id > 0) {
	/* fec1 uses fec0 mii_bus */		/* fec1 uses fec0 mii_bus */
	if (mii_cnt && fec0_mii_bus) {		if (mii_cnt && fec0_mii_bus) {
	fep->mii_bus = fec0_mii_bus;		fep->mii_bus = fec0_mii_bus;
	@@ -1076,7 +1077,7 @@ static int fec_enet_mii_init(struct platform_device *pdev)
	fep->mii_bus->read = fec_enet_mdio_read;		fep->mii_bus->read = fec_enet_mdio_read;
	fep->mii_bus->write = fec_enet_mdio_write;		fep->mii_bus->write = fec_enet_mdio_write;
	fep->mii_bus->reset = fec_enet_mdio_reset;		fep->mii_bus->reset = fec_enet_mdio_reset;
	snprintf(fep->mii_bus->id, MII_BUS_ID_SIZE, "%x", pdev->id + 1);		snprintf(fep->mii_bus->id, MII_BUS_ID_SIZE, "%x", fep->dev_id + 1);
	fep->mii_bus->priv = fep;		fep->mii_bus->priv = fep;
	fep->mii_bus->parent = &pdev->dev;		fep->mii_bus->parent = &pdev->dev;

	@@ -1536,6 +1537,7 @@ fec_probe(struct platform_device *pdev)
	int i, irq, ret = 0;		int i, irq, ret = 0;
	struct resource *r;		struct resource *r;
	const struct of_device_id *of_id;		const struct of_device_id *of_id;
			static int dev_id;

	of_id = of_match_device(fec_dt_ids, &pdev->dev);		of_id = of_match_device(fec_dt_ids, &pdev->dev);
	if (of_id)		if (of_id)
	@@ -1563,6 +1565,7 @@ fec_probe(struct platform_device *pdev)

	fep->hwp = ioremap(r->start, resource_size(r));		fep->hwp = ioremap(r->start, resource_size(r));
	fep->pdev = pdev;		fep->pdev = pdev;
			fep->dev_id = dev_id++;

	if (!fep->hwp) {		if (!fep->hwp) {
	ret = -ENOMEM;		ret = -ENOMEM;

drivers/net/ethernet/freescale/fsl_pq_mdio.c

+6 −7

Original line number	Original line	Diff line number	Diff line
	@@ -356,15 +356,14 @@ static int fsl_pq_mdio_probe(struct platform_device *ofdev)

	if (prop)		if (prop)
	tbiaddr = *prop;		tbiaddr = *prop;
			}

	if (tbiaddr == -1) {		if (tbiaddr == -1) {
	err = -EBUSY;		err = -EBUSY;

	goto err_free_irqs;		goto err_free_irqs;
	} else {		} else {
	out_be32(tbipa, tbiaddr);		out_be32(tbipa, tbiaddr);
	}		}
	}

	err = of_mdiobus_register(new_bus, np);		err = of_mdiobus_register(new_bus, np);
	if (err) {		if (err) {

drivers/net/ppp/pptp.c

+1 −3

Original line number	Original line	Diff line number	Diff line
	@@ -423,10 +423,8 @@ static int pptp_bind(struct socket sock, struct sockaddr uservaddr,
	lock_sock(sk);		lock_sock(sk);

	opt->src_addr = sp->sa_addr.pptp;		opt->src_addr = sp->sa_addr.pptp;
	if (add_chan(po)) {		if (add_chan(po))
	release_sock(sk);
	error = -EBUSY;		error = -EBUSY;
	}

	release_sock(sk);		release_sock(sk);
	return error;		return error;

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -286,7 +286,7 @@ static bool ath_complete_reset(struct ath_softc *sc, bool start)
	ath_start_ani(common);		ath_start_ani(common);
	}		}

	if (ath9k_hw_ops(ah)->antdiv_comb_conf_get && sc->ant_rx != 3) {		if ((ah->caps.hw_caps & ATH9K_HW_CAP_ANT_DIV_COMB) && sc->ant_rx != 3) {
	struct ath_hw_antcomb_conf div_ant_conf;		struct ath_hw_antcomb_conf div_ant_conf;
	u8 lna_conf;		u8 lna_conf;

drivers/net/wireless/rtlwifi/rtl8192ce/phy.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -569,7 +569,7 @@ static bool _rtl92ce_phy_set_rf_power_state(struct ieee80211_hw *hw,
	}		}
	case ERFSLEEP:{		case ERFSLEEP:{
	if (ppsc->rfpwr_state == ERFOFF)		if (ppsc->rfpwr_state == ERFOFF)
	break;		return false;
	for (queue_id = 0, i = 0;		for (queue_id = 0, i = 0;
	queue_id < RTL_PCI_MAX_TX_QUEUE_COUNT;) {		queue_id < RTL_PCI_MAX_TX_QUEUE_COUNT;) {
	ring = &pcipriv->dev.tx_ring[queue_id];		ring = &pcipriv->dev.tx_ring[queue_id];