Skip to content

Commit

Permalink
Merge branch 'davem-next' of master.kernel.org:/pub/scm/linux/kernel/…
Browse files Browse the repository at this point in the history 
…git/jgarzik/netdev-2.6
  • Loading branch information
David S. Miller committed Jun 12, 2008
2 parents e6e30ad + 0c1aa20 commit 030352a
Show file tree
Hide file tree
Showing 22 changed files with 5,017 additions and 488 deletions.
14 changes: 13 additions & 1 deletion drivers/net/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -524,6 +524,18 @@ config STNIC

If unsure, say N.

config SH_ETH
tristate "Renesas SuperH Ethernet support"
depends on SUPERH && \
(CPU_SUBTYPE_SH7710 || CPU_SUBTYPE_SH7712)
select CRC32
select MII
select MDIO_BITBANG
select PHYLIB
help
Renesas SuperH Ethernet device driver.
This driver support SH7710 and SH7712.

config SUNLANCE
tristate "Sun LANCE support"
depends on SBUS
Expand Down Expand Up @@ -955,7 +967,7 @@ config SMC911X
tristate "SMSC LAN911[5678] support"
select CRC32
select MII
depends on ARCH_PXA || SH_MAGIC_PANEL_R2
depends on ARCH_PXA || SUPERH
help
This is a driver for SMSC's LAN911x series of Ethernet chipsets
including the new LAN9115, LAN9116, LAN9117, and LAN9118.
Expand Down
2 changes: 2 additions & 0 deletions drivers/net/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ obj-$(CONFIG_VIA_RHINE) += via-rhine.o
obj-$(CONFIG_VIA_VELOCITY) += via-velocity.o
obj-$(CONFIG_ADAPTEC_STARFIRE) += starfire.o
obj-$(CONFIG_RIONET) += rionet.o
obj-$(CONFIG_SH_ETH) += sh_eth.o

#
# end link order section
Expand Down Expand Up @@ -236,6 +237,7 @@ obj-$(CONFIG_USB_CATC) += usb/
obj-$(CONFIG_USB_KAWETH) += usb/
obj-$(CONFIG_USB_PEGASUS) += usb/
obj-$(CONFIG_USB_RTL8150) += usb/
obj-$(CONFIG_USB_HSO) += usb/
obj-$(CONFIG_USB_USBNET) += usb/
obj-$(CONFIG_USB_ZD1201) += usb/

Expand Down
4 changes: 0 additions & 4 deletions drivers/net/a2065.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -475,16 +475,12 @@ static irqreturn_t lance_interrupt (int irq, void *dev_id)
return IRQ_HANDLED;
}

struct net_device *last_dev;

static int lance_open (struct net_device *dev)
{
struct lance_private *lp = netdev_priv(dev);
volatile struct lance_regs *ll = lp->ll;
int ret;

last_dev = dev;

/* Stop the Lance */
ll->rap = LE_CSR0;
ll->rdp = LE_C0_STOP;
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/atarilance.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ struct lance_private {

/* Possible memory/IO addresses for probing */

struct lance_addr {
static struct lance_addr {
unsigned long memaddr;
unsigned long ioaddr;
int slow_flag;
Expand Down
4 changes: 0 additions & 4 deletions drivers/net/declance.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -773,17 +773,13 @@ static irqreturn_t lance_interrupt(int irq, void *dev_id)
return IRQ_HANDLED;
}

struct net_device *last_dev = 0;

static int lance_open(struct net_device *dev)
{
volatile u16 *ib = (volatile u16 *)dev->mem_start;
struct lance_private *lp = netdev_priv(dev);
volatile struct lance_regs *ll = lp->ll;
int status = 0;

last_dev = dev;

/* Stop the Lance */
writereg(&ll->rap, LE_CSR0);
writereg(&ll->rdp, LE_C0_STOP);
Expand Down
5 changes: 5 additions & 0 deletions drivers/net/e1000e/netdev.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4343,6 +4343,11 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
netdev->features |= NETIF_F_TSO;
netdev->features |= NETIF_F_TSO6;

netdev->vlan_features |= NETIF_F_TSO;
netdev->vlan_features |= NETIF_F_TSO6;
netdev->vlan_features |= NETIF_F_HW_CSUM;
netdev->vlan_features |= NETIF_F_SG;

if (pci_using_dac)
netdev->features |= NETIF_F_HIGHDMA;

Expand Down
4 changes: 2 additions & 2 deletions drivers/net/hplance.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -220,12 +220,12 @@ static int hplance_close(struct net_device *dev)
return 0;
}

int __init hplance_init_module(void)
static int __init hplance_init_module(void)
{
return dio_register_driver(&hplance_driver);
}

void __exit hplance_cleanup_module(void)
static void __exit hplance_cleanup_module(void)
{
dio_unregister_driver(&hplance_driver);
}
Expand Down
7 changes: 6 additions & 1 deletion drivers/net/igb/igb_main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -967,8 +967,13 @@ static int __devinit igb_probe(struct pci_dev *pdev,
NETIF_F_HW_VLAN_FILTER;

netdev->features |= NETIF_F_TSO;

netdev->features |= NETIF_F_TSO6;

netdev->vlan_features |= NETIF_F_TSO;
netdev->vlan_features |= NETIF_F_TSO6;
netdev->vlan_features |= NETIF_F_HW_CSUM;
netdev->vlan_features |= NETIF_F_SG;

if (pci_using_dac)
netdev->features |= NETIF_F_HIGHDMA;

Expand Down
7 changes: 6 additions & 1 deletion drivers/net/ixgbe/ixgbe_main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3518,8 +3518,13 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
NETIF_F_HW_VLAN_FILTER;

netdev->features |= NETIF_F_TSO;

netdev->features |= NETIF_F_TSO6;

netdev->vlan_features |= NETIF_F_TSO;
netdev->vlan_features |= NETIF_F_TSO6;
netdev->vlan_features |= NETIF_F_HW_CSUM;
netdev->vlan_features |= NETIF_F_SG;

if (pci_using_dac)
netdev->features |= NETIF_F_HIGHDMA;

Expand Down
4 changes: 4 additions & 0 deletions drivers/net/lib8390.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -553,6 +553,8 @@ static void __ei_poll(struct net_device *dev)
static void ei_tx_err(struct net_device *dev)
{
unsigned long e8390_base = dev->base_addr;
/* ei_local is used on some platforms via the EI_SHIFT macro */
struct ei_device *ei_local __maybe_unused = netdev_priv(dev);
unsigned char txsr = ei_inb_p(e8390_base+EN0_TSR);
unsigned char tx_was_aborted = txsr & (ENTSR_ABT+ENTSR_FU);

Expand Down Expand Up @@ -815,6 +817,8 @@ static void ei_rx_overrun(struct net_device *dev)
{
unsigned long e8390_base = dev->base_addr;
unsigned char was_txing, must_resend = 0;
/* ei_local is used on some platforms via the EI_SHIFT macro */
struct ei_device *ei_local __maybe_unused = netdev_priv(dev);

/*
* Record whether a Tx was in progress and then issue the
Expand Down
8 changes: 3 additions & 5 deletions drivers/net/mac8390.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,6 @@ enum mac8390_access {
ACCESS_16,
};

extern enum mac8390_type mac8390_ident(struct nubus_dev * dev);
extern int mac8390_memsize(unsigned long membase);
extern int mac8390_memtest(struct net_device * dev);
static int mac8390_initdev(struct net_device * dev, struct nubus_dev * ndev,
enum mac8390_type type);
Expand Down Expand Up @@ -163,7 +161,7 @@ static void slow_sane_block_output(struct net_device *dev, int count,
static void word_memcpy_tocard(void *tp, const void *fp, int count);
static void word_memcpy_fromcard(void *tp, const void *fp, int count);

enum mac8390_type __init mac8390_ident(struct nubus_dev * dev)
static enum mac8390_type __init mac8390_ident(struct nubus_dev *dev)
{
switch (dev->dr_sw) {
case NUBUS_DRSW_3COM:
Expand Down Expand Up @@ -234,7 +232,7 @@ enum mac8390_type __init mac8390_ident(struct nubus_dev * dev)
return MAC8390_NONE;
}

enum mac8390_access __init mac8390_testio(volatile unsigned long membase)
static enum mac8390_access __init mac8390_testio(volatile unsigned long membase)
{
unsigned long outdata = 0xA5A0B5B0;
unsigned long indata = 0x00000000;
Expand All @@ -252,7 +250,7 @@ enum mac8390_access __init mac8390_testio(volatile unsigned long membase)
return ACCESS_UNKNOWN;
}

int __init mac8390_memsize(unsigned long membase)
static int __init mac8390_memsize(unsigned long membase)
{
unsigned long flags;
int i, j;
Expand Down
6 changes: 5 additions & 1 deletion drivers/net/macb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,12 @@ static void __init macb_get_hwaddr(struct macb *bp)
addr[4] = top & 0xff;
addr[5] = (top >> 8) & 0xff;

if (is_valid_ether_addr(addr))
if (is_valid_ether_addr(addr)) {
memcpy(bp->dev->dev_addr, addr, sizeof(addr));
} else {
dev_info(&bp->pdev->dev, "invalid hw address, using random\n");
random_ether_addr(bp->dev->dev_addr);
}
}

static int macb_mdio_read(struct mii_bus *bus, int mii_id, int regnum)
Expand Down
19 changes: 8 additions & 11 deletions drivers/net/macsonic.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,6 @@ static unsigned int sonic_debug = 1;

static int sonic_version_printed;

extern int mac_onboard_sonic_probe(struct net_device* dev);
extern int mac_nubus_sonic_probe(struct net_device* dev);

/* For onboard SONIC */
#define ONBOARD_SONIC_REGISTERS 0x50F0A000
#define ONBOARD_SONIC_PROM_BASE 0x50f08000
Expand Down Expand Up @@ -170,7 +167,7 @@ static int macsonic_close(struct net_device* dev)
return err;
}

int __init macsonic_init(struct net_device* dev)
static int __init macsonic_init(struct net_device *dev)
{
struct sonic_local* lp = netdev_priv(dev);

Expand Down Expand Up @@ -218,7 +215,7 @@ int __init macsonic_init(struct net_device* dev)
return 0;
}

int __init mac_onboard_sonic_ethernet_addr(struct net_device* dev)
static int __init mac_onboard_sonic_ethernet_addr(struct net_device *dev)
{
struct sonic_local *lp = netdev_priv(dev);
const int prom_addr = ONBOARD_SONIC_PROM_BASE;
Expand Down Expand Up @@ -284,7 +281,7 @@ int __init mac_onboard_sonic_ethernet_addr(struct net_device* dev)
} else return 0;
}

int __init mac_onboard_sonic_probe(struct net_device* dev)
static int __init mac_onboard_sonic_probe(struct net_device *dev)
{
/* Bwahahaha */
static int once_is_more_than_enough;
Expand Down Expand Up @@ -405,9 +402,9 @@ int __init mac_onboard_sonic_probe(struct net_device* dev)
return macsonic_init(dev);
}

int __init mac_nubus_sonic_ethernet_addr(struct net_device* dev,
unsigned long prom_addr,
int id)
static int __init mac_nubus_sonic_ethernet_addr(struct net_device *dev,
unsigned long prom_addr,
int id)
{
int i;
for(i = 0; i < 6; i++)
Expand All @@ -420,7 +417,7 @@ int __init mac_nubus_sonic_ethernet_addr(struct net_device* dev,
return 0;
}

int __init macsonic_ident(struct nubus_dev* ndev)
static int __init macsonic_ident(struct nubus_dev *ndev)
{
if (ndev->dr_hw == NUBUS_DRHW_ASANTE_LC &&
ndev->dr_sw == NUBUS_DRSW_SONIC_LC)
Expand All @@ -445,7 +442,7 @@ int __init macsonic_ident(struct nubus_dev* ndev)
return -1;
}

int __init mac_nubus_sonic_probe(struct net_device* dev)
static int __init mac_nubus_sonic_probe(struct net_device *dev)
{
static int slots;
struct nubus_dev* ndev = NULL;
Expand Down
Loading

0 comments on commit 030352a

Please sign in to comment.