Commit fffdedef authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  net/mac80211/rx.c: fix build error
  acpi: Make ACPI_TOSHIBA depend on INPUT.
  net/bfin_mac.c MDIO namespace fixes
  jme: remove unused #include <version.h>
  netfilter: remove unused #include <version.h>
  net: Fix off-by-one in skb_dma_map
  smc911x: Add support for LAN921{5,7,8} chips from SMSC
  qlge: remove duplicated #include
  wireless: remove duplicated #include
  net/au1000_eth.c MDIO namespace fixes
  net/tc35815.c: fix compilation
  sky2: Fix WOL regression
  r8169: NULL pointer dereference on r8169 load
parents 5723ff93 bf94e17b

drivers/acpi/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -259,7 +259,7 @@ config ACPI_ASUS 


config ACPI_TOSHIBA

	tristate "Toshiba Laptop Extras"

	depends on X86

	depends on X86 && INPUT

	select INPUT_POLLDEV

	select NET

	select RFKILL

drivers/net/au1000_eth.c

+14 −13
Original line number Diff line number Diff line
@@ -94,8 +94,8 @@ static irqreturn_t au1000_interrupt(int, void *); 
static void au1000_tx_timeout(struct net_device *);

static void set_rx_mode(struct net_device *);

static int au1000_ioctl(struct net_device *, struct ifreq *, int);

static int mdio_read(struct net_device *, int, int);

static void mdio_write(struct net_device *, int, int, u16);

static int au1000_mdio_read(struct net_device *, int, int);

static void au1000_mdio_write(struct net_device *, int, int, u16);

static void au1000_adjust_link(struct net_device *);

static void enable_mac(struct net_device *, int);
@@ -191,7 +191,7 @@ struct au1000_private *au_macs[NUM_ETH_INTERFACES]; 
/*

 * MII operations

 */

static int mdio_read(struct net_device *dev, int phy_addr, int reg)

static int au1000_mdio_read(struct net_device *dev, int phy_addr, int reg)

{

	struct au1000_private *aup = (struct au1000_private *) dev->priv;

	volatile u32 *const mii_control_reg = &aup->mac->mii_control;
@@ -225,7 +225,8 @@ static int mdio_read(struct net_device *dev, int phy_addr, int reg) 
	return (int)*mii_data_reg;

}



static void mdio_write(struct net_device *dev, int phy_addr, int reg, u16 value)

static void au1000_mdio_write(struct net_device *dev, int phy_addr,

			      int reg, u16 value)

{

	struct au1000_private *aup = (struct au1000_private *) dev->priv;

	volatile u32 *const mii_control_reg = &aup->mac->mii_control;
@@ -249,7 +250,7 @@ static void mdio_write(struct net_device *dev, int phy_addr, int reg, u16 value) 
	*mii_control_reg = mii_control;

}



static int mdiobus_read(struct mii_bus *bus, int phy_addr, int regnum)

static int au1000_mdiobus_read(struct mii_bus *bus, int phy_addr, int regnum)

{

	/* WARNING: bus->phy_map[phy_addr].attached_dev == dev does

	 * _NOT_ hold (e.g. when PHY is accessed through other MAC's MII bus) */
@@ -257,21 +258,21 @@ static int mdiobus_read(struct mii_bus *bus, int phy_addr, int regnum) 


	enable_mac(dev, 0); /* make sure the MAC associated with this

			     * mii_bus is enabled */

	return mdio_read(dev, phy_addr, regnum);

	return au1000_mdio_read(dev, phy_addr, regnum);

}



static int mdiobus_write(struct mii_bus *bus, int phy_addr, int regnum,

static int au1000_mdiobus_write(struct mii_bus *bus, int phy_addr, int regnum,

				u16 value)

{

	struct net_device *const dev = bus->priv;



	enable_mac(dev, 0); /* make sure the MAC associated with this

			     * mii_bus is enabled */

	mdio_write(dev, phy_addr, regnum, value);

	au1000_mdio_write(dev, phy_addr, regnum, value);

	return 0;

}



static int mdiobus_reset(struct mii_bus *bus)

static int au1000_mdiobus_reset(struct mii_bus *bus)

{

	struct net_device *const dev = bus->priv;
@@ -703,9 +704,9 @@ static struct net_device * au1000_probe(int port_num) 
		goto err_out;



	aup->mii_bus->priv = dev;

	aup->mii_bus->read = mdiobus_read;

	aup->mii_bus->write = mdiobus_write;

	aup->mii_bus->reset = mdiobus_reset;

	aup->mii_bus->read = au1000_mdiobus_read;

	aup->mii_bus->write = au1000_mdiobus_write;

	aup->mii_bus->reset = au1000_mdiobus_reset;

	aup->mii_bus->name = "au1000_eth_mii";

	snprintf(aup->mii_bus->id, MII_BUS_ID_SIZE, "%x", aup->mac_id);

	aup->mii_bus->irq = kmalloc(sizeof(int)*PHY_MAX_ADDR, GFP_KERNEL);

drivers/net/bfin_mac.c

+13 −13
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ init_error: 
 * MII operations

 */

/* Wait until the previous MDC/MDIO transaction has completed */

static void mdio_poll(void)

static void bfin_mdio_poll(void)

{

	int timeout_cnt = MAX_TIMEOUT_CNT;
@@ -269,25 +269,25 @@ static void mdio_poll(void) 
}



/* Read an off-chip register in a PHY through the MDC/MDIO port */

static int mdiobus_read(struct mii_bus *bus, int phy_addr, int regnum)

static int bfin_mdiobus_read(struct mii_bus *bus, int phy_addr, int regnum)

{

	mdio_poll();

	bfin_mdio_poll();



	/* read mode */

	bfin_write_EMAC_STAADD(SET_PHYAD((u16) phy_addr) |

				SET_REGAD((u16) regnum) |

				STABUSY);



	mdio_poll();

	bfin_mdio_poll();



	return (int) bfin_read_EMAC_STADAT();

}



/* Write an off-chip register in a PHY through the MDC/MDIO port */

static int mdiobus_write(struct mii_bus *bus, int phy_addr, int regnum,

static int bfin_mdiobus_write(struct mii_bus *bus, int phy_addr, int regnum,

			      u16 value)

{

	mdio_poll();

	bfin_mdio_poll();



	bfin_write_EMAC_STADAT((u32) value);
@@ -297,12 +297,12 @@ static int mdiobus_write(struct mii_bus *bus, int phy_addr, int regnum, 
				STAOP |

				STABUSY);



	mdio_poll();

	bfin_mdio_poll();



	return 0;

}



static int mdiobus_reset(struct mii_bus *bus)

static int bfin_mdiobus_reset(struct mii_bus *bus)

{

	return 0;

}
@@ -818,7 +818,7 @@ static void bfin_mac_enable(void) 
	bfin_write_DMA1_CONFIG(rx_list_head->desc_a.config);



	/* Wait MII done */

	mdio_poll();

	bfin_mdio_poll();



	/* We enable only RX here */

	/* ASTP   : Enable Automatic Pad Stripping
@@ -1063,9 +1063,9 @@ static int __devinit bfin_mac_probe(struct platform_device *pdev) 
		goto out_err_mdiobus_alloc;



	lp->mii_bus->priv = ndev;

	lp->mii_bus->read = mdiobus_read;

	lp->mii_bus->write = mdiobus_write;

	lp->mii_bus->reset = mdiobus_reset;

	lp->mii_bus->read = bfin_mdiobus_read;

	lp->mii_bus->write = bfin_mdiobus_write;

	lp->mii_bus->reset = bfin_mdiobus_reset;

	lp->mii_bus->name = "bfin_mac_mdio";

	snprintf(lp->mii_bus->id, MII_BUS_ID_SIZE, "0");

	lp->mii_bus->irq = kmalloc(sizeof(int)*PHY_MAX_ADDR, GFP_KERNEL);

drivers/net/jme.c

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
 *

 */



#include <linux/version.h>

#include <linux/module.h>

#include <linux/kernel.h>

#include <linux/pci.h>

drivers/net/qlge/qlge_ethtool.c

+0 −1
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 
#include <linux/skbuff.h>

#include <linux/rtnetlink.h>

#include <linux/if_vlan.h>

#include <linux/init.h>

#include <linux/delay.h>

#include <linux/mm.h>

#include <linux/vmalloc.h>

CRA Git | Maintained and supported by SUSTech CRA and CCSE