Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 (b57dfbc4) · Commits · e / devices / android_kernel_teracube_emerald

drivers/net/e1000/e1000_ethtool.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -50,7 +50,7 @@ struct e1000_stats {
		int stat_offset;
		};

		#define E1000_STAT(m) sizeof(((struct e1000_adapter *)0)->m), \
		#define E1000_STAT(m) FIELD_SIZEOF(struct e1000_adapter, m), \
		offsetof(struct e1000_adapter, m)
		static const struct e1000_stats e1000_gstrings_stats[] = {
		{ "rx_packets", E1000_STAT(stats.gprc) },

drivers/net/e1000/e1000_main.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -1195,6 +1195,14 @@ e1000_probe(struct pci_dev *pdev,

		printk("%s\n", print_mac(mac, netdev->dev_addr));

		if (adapter->hw.bus_type == e1000_bus_type_pci_express) {
		DPRINTK(PROBE, WARNING, "This device (id %04x:%04x) will no "
		"longer be supported by this driver in the future.\n",
		pdev->vendor, pdev->device);
		DPRINTK(PROBE, WARNING, "please use the \"e1000e\" "
		"driver instead.\n");
		}

		/* reset the hardware with the new settings */
		e1000_reset(adapter);

drivers/net/e1000e/netdev.c

+4 −30

Original line number	Diff line number	Diff line
		@@ -1055,23 +1055,6 @@ static void e1000_release_hw_control(struct e1000_adapter *adapter)
		}
		}

		static void e1000_release_manageability(struct e1000_adapter *adapter)
		{
		if (adapter->flags & FLAG_MNG_PT_ENABLED) {
		struct e1000_hw *hw = &adapter->hw;

		u32 manc = er32(MANC);

		/* re-enable hardware interception of ARP */
		manc \|= E1000_MANC_ARP_EN;
		manc &= ~E1000_MANC_EN_MNG2HOST;

		/* don't explicitly have to mess with MANC2H since
		* MANC has an enable disable that gates MANC2H */
		ew32(MANC, manc);
		}
		}

		/**
		* @e1000_alloc_ring - allocate memory for a ring structure
		**/
		@@ -1561,9 +1544,6 @@ static void e1000_init_manageability(struct e1000_adapter *adapter)

		manc = er32(MANC);

		/* disable hardware interception of ARP */
		manc &= ~(E1000_MANC_ARP_EN);

		/* enable receiving management packets to the host. this will probably
		* generate destination unreachable messages from the host OS, but
		* the packets will be handled on SMBUS */
		@@ -1690,6 +1670,9 @@ static void e1000_setup_rctl(struct e1000_adapter *adapter)
		else
		rctl \|= E1000_RCTL_LPE;

		/* Enable hardware CRC frame stripping */
		rctl \|= E1000_RCTL_SECRC;

		/* Setup buffer sizes */
		rctl &= ~E1000_RCTL_SZ_4096;
		rctl \|= E1000_RCTL_BSEX;
		@@ -1756,9 +1739,6 @@ static void e1000_setup_rctl(struct e1000_adapter *adapter)
		/* Enable Packet split descriptors */
		rctl \|= E1000_RCTL_DTYP_PS;

		/* Enable hardware CRC frame stripping */
		rctl \|= E1000_RCTL_SECRC;

		psrctl \|= adapter->rx_ps_bsize0 >>
		E1000_PSRCTL_BSIZE0_SHIFT;

		@@ -2008,7 +1988,7 @@ static void e1000_power_down_phy(struct e1000_adapter *adapter)
		u16 mii_reg;

		/* WoL is enabled */
		if (!adapter->wol)
		if (adapter->wol)
		return;

		/* non-copper PHY? */
		@@ -2140,8 +2120,6 @@ void e1000e_reset(struct e1000_adapter *adapter)
		phy_data &= ~IGP02E1000_PM_SPD;
		e1e_wphy(hw, IGP02E1000_PHY_POWER_MGMT, phy_data);
		}

		e1000_release_manageability(adapter);
		}

		int e1000e_up(struct e1000_adapter *adapter)
		@@ -3487,8 +3465,6 @@ static int e1000_suspend(struct pci_dev *pdev, pm_message_t state)
		pci_enable_wake(pdev, PCI_D3cold, 0);
		}

		e1000_release_manageability(adapter);

		/* make sure adapter isn't asleep if manageability is enabled */
		if (adapter->flags & FLAG_MNG_PT_ENABLED) {
		pci_enable_wake(pdev, PCI_D3hot, 1);
		@@ -4054,8 +4030,6 @@ static void __devexit e1000_remove(struct pci_dev *pdev)

		flush_scheduled_work();

		e1000_release_manageability(adapter);

		/* Release control of h/w to f/w. If f/w is AMT enabled, this
		* would have already happened in close and is redundant. */
		e1000_release_hw_control(adapter);

drivers/net/gianfar.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -130,8 +130,8 @@ static void free_skb_resources(struct gfar_private *priv);
		static void gfar_set_multi(struct net_device *dev);
		static void gfar_set_hash_for_addr(struct net_device dev, u8 addr);
		static void gfar_configure_serdes(struct net_device *dev);
		extern int gfar_local_mdio_write(struct gfar_mii *regs, int mii_id, int regnum, u16 value);
		extern int gfar_local_mdio_read(struct gfar_mii *regs, int mii_id, int regnum);
		extern int gfar_local_mdio_write(struct gfar_mii __iomem *regs, int mii_id, int regnum, u16 value);
		extern int gfar_local_mdio_read(struct gfar_mii __iomem *regs, int mii_id, int regnum);
		#ifdef CONFIG_GFAR_NAPI
		static int gfar_poll(struct napi_struct *napi, int budget);
		#endif

drivers/net/gianfar_mii.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -51,7 +51,7 @@
		* the local mdio pins, which may not be the same as system mdio bus, used for
		* controlling the external PHYs, for example.
		*/
		int gfar_local_mdio_write(struct gfar_mii *regs, int mii_id,
		int gfar_local_mdio_write(struct gfar_mii __iomem *regs, int mii_id,
		int regnum, u16 value)
		{
		/* Set the PHY address and the register address we want to write */
		@@ -77,7 +77,7 @@ int gfar_local_mdio_write(struct gfar_mii *regs, int mii_id,
		* and are always tied to the local mdio pins, which may not be the
		* same as system mdio bus, used for controlling the external PHYs, for eg.
		*/
		int gfar_local_mdio_read(struct gfar_mii *regs, int mii_id, int regnum)
		int gfar_local_mdio_read(struct gfar_mii __iomem *regs, int mii_id, int regnum)

		{
		u16 value;