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: (77 commits) [IPV6]: Reorg struct ifmcaddr6 to save some bytes [INET_TIMEWAIT_SOCK]: Reorganize struct inet_timewait_sock to save some bytes [DCCP]: Reorganize struct dccp_sock to save 8 bytes [INET6]: Reorganize struct inet6_dev to save 8 bytes [SOCK] proto: Add hashinfo member to struct proto EMAC driver: Fix bug: The clock divisor is set to all ones at reset. EMAC driver: fix bug - invalidate data cache of new_skb->data range when cache is WB EMAC driver: add power down mode EMAC driver: ADSP-BF52x arch/mach support EMAC driver: use simpler comment headers and strip out information that is maintained in the scm's log EMAC driver: bf537 MAC multicast hash filtering patch EMAC driver: define MDC_CLK=2.5MHz and caculate mdc_div according to SCLK. EMAC driver: shorten the mdelay value to solve netperf performance issue [netdrvr] sis190: build fix sky2: fix Wake On Lan interaction with BIOS sky2: restore multicast addresses after recovery pci-skeleton: Misc fixes to build neatly phylib: Add Realtek 821x eth PHY support natsemi: Update locking documentation PHYLIB: Locking fixes for PHY I/O potentially sleeping ...
This commit is contained in:
Linus Torvalds
commit
a2e4e108c5
84 changed files with 1294 additions and 1139 deletions
25
MAINTAINERS
25
MAINTAINERS
|
|
@ -84,13 +84,6 @@ S: Status, one of the following:
|
|||
it has been replaced by a better system and you
|
||||
should be using that.
|
||||
|
||||
3C359 NETWORK DRIVER
|
||||
P: Mike Phillips
|
||||
M: mikep@linuxtr.net
|
||||
L: netdev@vger.kernel.org
|
||||
W: http://www.linuxtr.net
|
||||
S: Maintained
|
||||
|
||||
3C505 NETWORK DRIVER
|
||||
P: Philip Blundell
|
||||
M: philb@gnu.org
|
||||
|
|
@ -939,8 +932,6 @@ M: maxk@qualcomm.com
|
|||
S: Maintained
|
||||
|
||||
BONDING DRIVER
|
||||
P: Chad Tindel
|
||||
M: ctindel@users.sourceforge.net
|
||||
P: Jay Vosburgh
|
||||
M: fubar@us.ibm.com
|
||||
L: bonding-devel@lists.sourceforge.net
|
||||
|
|
@ -2864,15 +2855,6 @@ L: ocfs2-devel@oss.oracle.com
|
|||
W: http://oss.oracle.com/projects/ocfs2/
|
||||
S: Supported
|
||||
|
||||
OLYMPIC NETWORK DRIVER
|
||||
P: Peter De Shrijver
|
||||
M: p2@ace.ulyssis.student.kuleuven.ac.be
|
||||
P: Mike Phillips
|
||||
M: mikep@linuxtr.net
|
||||
L: netdev@vger.kernel.org
|
||||
W: http://www.linuxtr.net
|
||||
S: Maintained
|
||||
|
||||
OMNIKEY CARDMAN 4000 DRIVER
|
||||
P: Harald Welte
|
||||
M: laforge@gnumonks.org
|
||||
|
|
@ -3788,13 +3770,6 @@ L: tlan-devel@lists.sourceforge.net (subscribers-only)
|
|||
W: http://sourceforge.net/projects/tlan/
|
||||
S: Maintained
|
||||
|
||||
TOKEN-RING NETWORK DRIVER
|
||||
P: Mike Phillips
|
||||
M: mikep@linuxtr.net
|
||||
L: netdev@vger.kernel.org
|
||||
W: http://www.linuxtr.net
|
||||
S: Maintained
|
||||
|
||||
TOSHIBA ACPI EXTRAS DRIVER
|
||||
P: John Belmonte
|
||||
M: toshiba_acpi@memebeam.org
|
||||
|
|
|
|||
|
|
@ -814,8 +814,8 @@ config ULTRA32
|
|||
will be called smc-ultra32.
|
||||
|
||||
config BFIN_MAC
|
||||
tristate "Blackfin 536/537 on-chip mac support"
|
||||
depends on NET_ETHERNET && (BF537 || BF536) && (!BF537_PORT_H)
|
||||
tristate "Blackfin 527/536/537 on-chip mac support"
|
||||
depends on NET_ETHERNET && (BF527 || BF537 || BF536) && (!BF537_PORT_H)
|
||||
select CRC32
|
||||
select MII
|
||||
select PHYLIB
|
||||
|
|
@ -828,7 +828,7 @@ config BFIN_MAC
|
|||
|
||||
config BFIN_MAC_USE_L1
|
||||
bool "Use L1 memory for rx/tx packets"
|
||||
depends on BFIN_MAC && BF537
|
||||
depends on BFIN_MAC && (BF527 || BF537)
|
||||
default y
|
||||
help
|
||||
To get maximum network performance, you should use L1 memory as rx/tx buffers.
|
||||
|
|
@ -855,7 +855,8 @@ config BFIN_RX_DESC_NUM
|
|||
config BFIN_MAC_RMII
|
||||
bool "RMII PHY Interface (EXPERIMENTAL)"
|
||||
depends on BFIN_MAC && EXPERIMENTAL
|
||||
default n
|
||||
default y if BFIN527_EZKIT
|
||||
default n if BFIN537_STAMP
|
||||
help
|
||||
Use Reduced PHY MII Interface
|
||||
|
||||
|
|
@ -1199,7 +1200,7 @@ config NE2_MCA
|
|||
|
||||
config IBMLANA
|
||||
tristate "IBM LAN Adapter/A support"
|
||||
depends on MCA && MCA_LEGACY
|
||||
depends on MCA
|
||||
---help---
|
||||
This is a Micro Channel Ethernet adapter. You need to set
|
||||
CONFIG_MCA to use this driver. It is both available as an in-kernel
|
||||
|
|
|
|||
|
|
@ -384,7 +384,7 @@ static void reset_phy(struct net_device *dev)
|
|||
/* Wait until PHY reset is complete */
|
||||
do {
|
||||
read_phy(lp->phy_address, MII_BMCR, &bmcr);
|
||||
} while (!(bmcr && BMCR_RESET));
|
||||
} while (!(bmcr & BMCR_RESET));
|
||||
|
||||
disable_mdi();
|
||||
spin_unlock_irq(&lp->lock);
|
||||
|
|
|
|||
|
|
@ -137,11 +137,12 @@ static int ax_initial_check(struct net_device *dev)
|
|||
static void ax_reset_8390(struct net_device *dev)
|
||||
{
|
||||
struct ei_device *ei_local = netdev_priv(dev);
|
||||
struct ax_device *ax = to_ax_dev(dev);
|
||||
unsigned long reset_start_time = jiffies;
|
||||
void __iomem *addr = (void __iomem *)dev->base_addr;
|
||||
|
||||
if (ei_debug > 1)
|
||||
printk(KERN_DEBUG "resetting the 8390 t=%ld...", jiffies);
|
||||
dev_dbg(&ax->dev->dev, "resetting the 8390 t=%ld\n", jiffies);
|
||||
|
||||
ei_outb(ei_inb(addr + NE_RESET), addr + NE_RESET);
|
||||
|
||||
|
|
@ -151,7 +152,7 @@ static void ax_reset_8390(struct net_device *dev)
|
|||
/* This check _should_not_ be necessary, omit eventually. */
|
||||
while ((ei_inb(addr + EN0_ISR) & ENISR_RESET) == 0) {
|
||||
if (jiffies - reset_start_time > 2*HZ/100) {
|
||||
printk(KERN_WARNING "%s: %s did not complete.\n",
|
||||
dev_warn(&ax->dev->dev, "%s: %s did not complete.\n",
|
||||
__FUNCTION__, dev->name);
|
||||
break;
|
||||
}
|
||||
|
|
@ -165,13 +166,15 @@ static void ax_get_8390_hdr(struct net_device *dev, struct e8390_pkt_hdr *hdr,
|
|||
int ring_page)
|
||||
{
|
||||
struct ei_device *ei_local = netdev_priv(dev);
|
||||
struct ax_device *ax = to_ax_dev(dev);
|
||||
void __iomem *nic_base = ei_local->mem;
|
||||
|
||||
/* This *shouldn't* happen. If it does, it's the last thing you'll see */
|
||||
if (ei_status.dmaing) {
|
||||
printk(KERN_EMERG "%s: DMAing conflict in %s [DMAstat:%d][irqlock:%d].\n",
|
||||
dev_err(&ax->dev->dev, "%s: DMAing conflict in %s "
|
||||
"[DMAstat:%d][irqlock:%d].\n",
|
||||
dev->name, __FUNCTION__,
|
||||
ei_status.dmaing, ei_status.irqlock);
|
||||
ei_status.dmaing, ei_status.irqlock);
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -204,13 +207,16 @@ static void ax_block_input(struct net_device *dev, int count,
|
|||
struct sk_buff *skb, int ring_offset)
|
||||
{
|
||||
struct ei_device *ei_local = netdev_priv(dev);
|
||||
struct ax_device *ax = to_ax_dev(dev);
|
||||
void __iomem *nic_base = ei_local->mem;
|
||||
char *buf = skb->data;
|
||||
|
||||
if (ei_status.dmaing) {
|
||||
printk(KERN_EMERG "%s: DMAing conflict in ax_block_input "
|
||||
dev_err(&ax->dev->dev,
|
||||
"%s: DMAing conflict in %s "
|
||||
"[DMAstat:%d][irqlock:%d].\n",
|
||||
dev->name, ei_status.dmaing, ei_status.irqlock);
|
||||
dev->name, __FUNCTION__,
|
||||
ei_status.dmaing, ei_status.irqlock);
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -239,6 +245,7 @@ static void ax_block_output(struct net_device *dev, int count,
|
|||
const unsigned char *buf, const int start_page)
|
||||
{
|
||||
struct ei_device *ei_local = netdev_priv(dev);
|
||||
struct ax_device *ax = to_ax_dev(dev);
|
||||
void __iomem *nic_base = ei_local->mem;
|
||||
unsigned long dma_start;
|
||||
|
||||
|
|
@ -251,7 +258,7 @@ static void ax_block_output(struct net_device *dev, int count,
|
|||
|
||||
/* This *shouldn't* happen. If it does, it's the last thing you'll see */
|
||||
if (ei_status.dmaing) {
|
||||
printk(KERN_EMERG "%s: DMAing conflict in %s."
|
||||
dev_err(&ax->dev->dev, "%s: DMAing conflict in %s."
|
||||
"[DMAstat:%d][irqlock:%d]\n",
|
||||
dev->name, __FUNCTION__,
|
||||
ei_status.dmaing, ei_status.irqlock);
|
||||
|
|
@ -281,7 +288,8 @@ static void ax_block_output(struct net_device *dev, int count,
|
|||
|
||||
while ((ei_inb(nic_base + EN0_ISR) & ENISR_RDC) == 0) {
|
||||
if (jiffies - dma_start > 2*HZ/100) { /* 20ms */
|
||||
printk(KERN_WARNING "%s: timeout waiting for Tx RDC.\n", dev->name);
|
||||
dev_warn(&ax->dev->dev,
|
||||
"%s: timeout waiting for Tx RDC.\n", dev->name);
|
||||
ax_reset_8390(dev);
|
||||
ax_NS8390_init(dev,1);
|
||||
break;
|
||||
|
|
@ -424,10 +432,11 @@ static void
|
|||
ax_phy_write(struct net_device *dev, int phy_addr, int reg, int value)
|
||||
{
|
||||
struct ei_device *ei = (struct ei_device *) netdev_priv(dev);
|
||||
struct ax_device *ax = to_ax_dev(dev);
|
||||
unsigned long flags;
|
||||
|
||||
printk(KERN_DEBUG "%s: %p, %04x, %04x %04x\n",
|
||||
__FUNCTION__, dev, phy_addr, reg, value);
|
||||
dev_dbg(&ax->dev->dev, "%s: %p, %04x, %04x %04x\n",
|
||||
__FUNCTION__, dev, phy_addr, reg, value);
|
||||
|
||||
spin_lock_irqsave(&ei->page_lock, flags);
|
||||
|
||||
|
|
@ -750,14 +759,11 @@ static int ax_init_dev(struct net_device *dev, int first_init)
|
|||
ax_NS8390_init(dev, 0);
|
||||
|
||||
if (first_init) {
|
||||
printk("AX88796: %dbit, irq %d, %lx, MAC: ",
|
||||
ei_status.word16 ? 16:8, dev->irq, dev->base_addr);
|
||||
DECLARE_MAC_BUF(mac);
|
||||
|
||||
for (i = 0; i < ETHER_ADDR_LEN; i++)
|
||||
printk("%2.2x%c", dev->dev_addr[i],
|
||||
(i < (ETHER_ADDR_LEN-1) ? ':' : ' '));
|
||||
|
||||
printk("\n");
|
||||
dev_info(&ax->dev->dev, "%dbit, irq %d, %lx, MAC: %s\n",
|
||||
ei_status.word16 ? 16:8, dev->irq, dev->base_addr,
|
||||
print_mac(mac, dev->dev_addr));
|
||||
}
|
||||
|
||||
ret = register_netdev(dev);
|
||||
|
|
|
|||
|
|
@ -1,34 +1,11 @@
|
|||
/*
|
||||
* File: drivers/net/bfin_mac.c
|
||||
* Based on:
|
||||
* Maintainer:
|
||||
* Bryan Wu <bryan.wu@analog.com>
|
||||
* Blackfin On-Chip MAC Driver
|
||||
*
|
||||
* Original author:
|
||||
* Luke Yang <luke.yang@analog.com>
|
||||
* Copyright 2004-2007 Analog Devices Inc.
|
||||
*
|
||||
* Created:
|
||||
* Description:
|
||||
* Enter bugs at http://blackfin.uclinux.org/
|
||||
*
|
||||
* Modified:
|
||||
* Copyright 2004-2006 Analog Devices Inc.
|
||||
*
|
||||
* Bugs: Enter bugs at http://blackfin.uclinux.org/
|
||||
*
|
||||
* This program is free software ; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation ; either version 2, or (at your option)
|
||||
* any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY ; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program ; see the file COPYING.
|
||||
* If not, write to the Free Software Foundation,
|
||||
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
* Licensed under the GPL-2 or later.
|
||||
*/
|
||||
|
||||
#include <linux/init.h>
|
||||
|
|
@ -65,7 +42,7 @@
|
|||
#define DRV_NAME "bfin_mac"
|
||||
#define DRV_VERSION "1.1"
|
||||
#define DRV_AUTHOR "Bryan Wu, Luke Yang"
|
||||
#define DRV_DESC "Blackfin BF53[67] on-chip Ethernet MAC driver"
|
||||
#define DRV_DESC "Blackfin BF53[67] BF527 on-chip Ethernet MAC driver"
|
||||
|
||||
MODULE_AUTHOR(DRV_AUTHOR);
|
||||
MODULE_LICENSE("GPL");
|
||||
|
|
@ -296,7 +273,7 @@ static void mdio_poll(void)
|
|||
|
||||
/* poll the STABUSY bit */
|
||||
while ((bfin_read_EMAC_STAADD()) & STABUSY) {
|
||||
mdelay(10);
|
||||
udelay(1);
|
||||
if (timeout_cnt-- < 0) {
|
||||
printk(KERN_ERR DRV_NAME
|
||||
": wait MDC/MDIO transaction to complete timeout\n");
|
||||
|
|
@ -412,20 +389,26 @@ static void bf537_adjust_link(struct net_device *dev)
|
|||
spin_unlock_irqrestore(&lp->lock, flags);
|
||||
}
|
||||
|
||||
/* MDC = 2.5 MHz */
|
||||
#define MDC_CLK 2500000
|
||||
|
||||
static int mii_probe(struct net_device *dev)
|
||||
{
|
||||
struct bf537mac_local *lp = netdev_priv(dev);
|
||||
struct phy_device *phydev = NULL;
|
||||
unsigned short sysctl;
|
||||
int i;
|
||||
u32 sclk, mdc_div;
|
||||
|
||||
/* Enable PHY output early */
|
||||
if (!(bfin_read_VR_CTL() & PHYCLKOE))
|
||||
bfin_write_VR_CTL(bfin_read_VR_CTL() | PHYCLKOE);
|
||||
|
||||
/* MDC = 2.5 MHz */
|
||||
sclk = get_sclk();
|
||||
mdc_div = ((sclk / MDC_CLK) / 2) - 1;
|
||||
|
||||
sysctl = bfin_read_EMAC_SYSCTL();
|
||||
sysctl |= SET_MDCDIV(24);
|
||||
sysctl = (sysctl & ~MDCDIV) | SET_MDCDIV(mdc_div);
|
||||
bfin_write_EMAC_SYSCTL(sysctl);
|
||||
|
||||
/* search for connect PHY device */
|
||||
|
|
@ -477,8 +460,10 @@ static int mii_probe(struct net_device *dev)
|
|||
lp->phydev = phydev;
|
||||
|
||||
printk(KERN_INFO "%s: attached PHY driver [%s] "
|
||||
"(mii_bus:phy_addr=%s, irq=%d)\n",
|
||||
DRV_NAME, phydev->drv->name, phydev->dev.bus_id, phydev->irq);
|
||||
"(mii_bus:phy_addr=%s, irq=%d, mdc_clk=%dHz(mdc_div=%d)"
|
||||
"@sclk=%dMHz)\n",
|
||||
DRV_NAME, phydev->drv->name, phydev->dev.bus_id, phydev->irq,
|
||||
MDC_CLK, mdc_div, sclk/1000000);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -551,7 +536,7 @@ static void adjust_tx_list(void)
|
|||
*/
|
||||
if (current_tx_ptr->next->next == tx_list_head) {
|
||||
while (tx_list_head->status.status_word == 0) {
|
||||
mdelay(10);
|
||||
mdelay(1);
|
||||
if (tx_list_head->status.status_word != 0
|
||||
|| !(bfin_read_DMA2_IRQ_STATUS() & 0x08)) {
|
||||
goto adjust_head;
|
||||
|
|
@ -666,6 +651,12 @@ static void bf537mac_rx(struct net_device *dev)
|
|||
current_rx_ptr->skb = new_skb;
|
||||
current_rx_ptr->desc_a.start_addr = (unsigned long)new_skb->data - 2;
|
||||
|
||||
/* Invidate the data cache of skb->data range when it is write back
|
||||
* cache. It will prevent overwritting the new data from DMA
|
||||
*/
|
||||
blackfin_dcache_invalidate_range((unsigned long)new_skb->head,
|
||||
(unsigned long)new_skb->end);
|
||||
|
||||
len = (unsigned short)((current_rx_ptr->status.status_word) & RX_FRLEN);
|
||||
skb_put(skb, len);
|
||||
blackfin_dcache_invalidate_range((unsigned long)skb->head,
|
||||
|
|
@ -767,7 +758,7 @@ static void bf537mac_enable(void)
|
|||
|
||||
#if defined(CONFIG_BFIN_MAC_RMII)
|
||||
opmode |= RMII; /* For Now only 100MBit are supported */
|
||||
#ifdef CONFIG_BF_REV_0_2
|
||||
#if (defined(CONFIG_BF537) || defined(CONFIG_BF536)) && CONFIG_BF_REV_0_2
|
||||
opmode |= TE;
|
||||
#endif
|
||||
#endif
|
||||
|
|
@ -792,6 +783,39 @@ static void bf537mac_timeout(struct net_device *dev)
|
|||
netif_wake_queue(dev);
|
||||
}
|
||||
|
||||
static void bf537mac_multicast_hash(struct net_device *dev)
|
||||
{
|
||||
u32 emac_hashhi, emac_hashlo;
|
||||
struct dev_mc_list *dmi = dev->mc_list;
|
||||
char *addrs;
|
||||
int i;
|
||||
u32 crc;
|
||||
|
||||
emac_hashhi = emac_hashlo = 0;
|
||||
|
||||
for (i = 0; i < dev->mc_count; i++) {
|
||||
addrs = dmi->dmi_addr;
|
||||
dmi = dmi->next;
|
||||
|
||||
/* skip non-multicast addresses */
|
||||
if (!(*addrs & 1))
|
||||
continue;
|
||||
|
||||
crc = ether_crc(ETH_ALEN, addrs);
|
||||
crc >>= 26;
|
||||
|
||||
if (crc & 0x20)
|
||||
emac_hashhi |= 1 << (crc & 0x1f);
|
||||
else
|
||||
emac_hashlo |= 1 << (crc & 0x1f);
|
||||
}
|
||||
|
||||
bfin_write_EMAC_HASHHI(emac_hashhi);
|
||||
bfin_write_EMAC_HASHLO(emac_hashlo);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
/*
|
||||
* This routine will, depending on the values passed to it,
|
||||
* either make it accept multicast packets, go into
|
||||
|
|
@ -807,11 +831,17 @@ static void bf537mac_set_multicast_list(struct net_device *dev)
|
|||
sysctl = bfin_read_EMAC_OPMODE();
|
||||
sysctl |= RAF;
|
||||
bfin_write_EMAC_OPMODE(sysctl);
|
||||
} else if (dev->flags & IFF_ALLMULTI || dev->mc_count) {
|
||||
} else if (dev->flags & IFF_ALLMULTI) {
|
||||
/* accept all multicast */
|
||||
sysctl = bfin_read_EMAC_OPMODE();
|
||||
sysctl |= PAM;
|
||||
bfin_write_EMAC_OPMODE(sysctl);
|
||||
} else if (dev->mc_count) {
|
||||
/* set up multicast hash table */
|
||||
sysctl = bfin_read_EMAC_OPMODE();
|
||||
sysctl |= HM;
|
||||
bfin_write_EMAC_OPMODE(sysctl);
|
||||
bf537mac_multicast_hash(dev);
|
||||
} else {
|
||||
/* clear promisc or multicast mode */
|
||||
sysctl = bfin_read_EMAC_OPMODE();
|
||||
|
|
@ -860,10 +890,10 @@ static int bf537mac_open(struct net_device *dev)
|
|||
return retval;
|
||||
|
||||
phy_start(lp->phydev);
|
||||
phy_write(lp->phydev, MII_BMCR, BMCR_RESET);
|
||||
setup_system_regs(dev);
|
||||
bf537mac_disable();
|
||||
bf537mac_enable();
|
||||
|
||||
pr_debug("hardware init finished\n");
|
||||
netif_start_queue(dev);
|
||||
netif_carrier_on(dev);
|
||||
|
|
@ -886,6 +916,7 @@ static int bf537mac_close(struct net_device *dev)
|
|||
netif_carrier_off(dev);
|
||||
|
||||
phy_stop(lp->phydev);
|
||||
phy_write(lp->phydev, MII_BMCR, BMCR_PDOWN);
|
||||
|
||||
/* clear everything */
|
||||
bf537mac_shutdown(dev);
|
||||
|
|
@ -970,7 +1001,7 @@ static int __init bf537mac_probe(struct net_device *dev)
|
|||
/* register irq handler */
|
||||
if (request_irq
|
||||
(IRQ_MAC_RX, bf537mac_interrupt, IRQF_DISABLED | IRQF_SHARED,
|
||||
"BFIN537_MAC_RX", dev)) {
|
||||
"EMAC_RX", dev)) {
|
||||
printk(KERN_WARNING DRV_NAME
|
||||
": Unable to attach BlackFin MAC RX interrupt\n");
|
||||
return -EBUSY;
|
||||
|
|
|
|||
|
|
@ -1,34 +1,11 @@
|
|||
/*
|
||||
* File: drivers/net/bfin_mac.c
|
||||
* Based on:
|
||||
* Maintainer:
|
||||
* Bryan Wu <bryan.wu@analog.com>
|
||||
* Blackfin On-Chip MAC Driver
|
||||
*
|
||||
* Original author:
|
||||
* Luke Yang <luke.yang@analog.com>
|
||||
* Copyright 2004-2007 Analog Devices Inc.
|
||||
*
|
||||
* Created:
|
||||
* Description:
|
||||
* Enter bugs at http://blackfin.uclinux.org/
|
||||
*
|
||||
* Modified:
|
||||
* Copyright 2004-2006 Analog Devices Inc.
|
||||
*
|
||||
* Bugs: Enter bugs at http://blackfin.uclinux.org/
|
||||
*
|
||||
* This program is free software ; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation ; either version 2, or (at your option)
|
||||
* any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY ; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program ; see the file COPYING.
|
||||
* If not, write to the Free Software Foundation,
|
||||
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
* Licensed under the GPL-2 or later.
|
||||
*/
|
||||
|
||||
#define BFIN_MAC_CSUM_OFFLOAD
|
||||
|
|
|
|||
|
|
@ -1464,10 +1464,12 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
|
|||
dev_set_allmulti(slave_dev, 1);
|
||||
}
|
||||
|
||||
netif_tx_lock_bh(bond_dev);
|
||||
/* upload master's mc_list to new slave */
|
||||
for (dmi = bond_dev->mc_list; dmi; dmi = dmi->next) {
|
||||
dev_mc_add (slave_dev, dmi->dmi_addr, dmi->dmi_addrlen, 0);
|
||||
}
|
||||
netif_tx_unlock_bh(bond_dev);
|
||||
}
|
||||
|
||||
if (bond->params.mode == BOND_MODE_8023AD) {
|
||||
|
|
@ -1821,7 +1823,9 @@ int bond_release(struct net_device *bond_dev, struct net_device *slave_dev)
|
|||
}
|
||||
|
||||
/* flush master's mc_list from slave */
|
||||
netif_tx_lock_bh(bond_dev);
|
||||
bond_mc_list_flush(bond_dev, slave_dev);
|
||||
netif_tx_unlock_bh(bond_dev);
|
||||
}
|
||||
|
||||
netdev_set_master(slave_dev, NULL);
|
||||
|
|
@ -1942,7 +1946,9 @@ static int bond_release_all(struct net_device *bond_dev)
|
|||
}
|
||||
|
||||
/* flush master's mc_list from slave */
|
||||
netif_tx_lock_bh(bond_dev);
|
||||
bond_mc_list_flush(bond_dev, slave_dev);
|
||||
netif_tx_unlock_bh(bond_dev);
|
||||
}
|
||||
|
||||
netdev_set_master(slave_dev, NULL);
|
||||
|
|
@ -2795,14 +2801,11 @@ void bond_loadbalance_arp_mon(struct work_struct *work)
|
|||
}
|
||||
|
||||
if (do_failover) {
|
||||
rtnl_lock();
|
||||
write_lock_bh(&bond->curr_slave_lock);
|
||||
|
||||
bond_select_active_slave(bond);
|
||||
|
||||
write_unlock_bh(&bond->curr_slave_lock);
|
||||
rtnl_unlock();
|
||||
|
||||
}
|
||||
|
||||
re_arm:
|
||||
|
|
@ -2859,8 +2862,6 @@ void bond_activebackup_arp_mon(struct work_struct *work)
|
|||
|
||||
slave->link = BOND_LINK_UP;
|
||||
|
||||
rtnl_lock();
|
||||
|
||||
write_lock_bh(&bond->curr_slave_lock);
|
||||
|
||||
if ((!bond->curr_active_slave) &&
|
||||
|
|
@ -2896,7 +2897,6 @@ void bond_activebackup_arp_mon(struct work_struct *work)
|
|||
}
|
||||
|
||||
write_unlock_bh(&bond->curr_slave_lock);
|
||||
rtnl_unlock();
|
||||
}
|
||||
} else {
|
||||
read_lock(&bond->curr_slave_lock);
|
||||
|
|
@ -2966,7 +2966,6 @@ void bond_activebackup_arp_mon(struct work_struct *work)
|
|||
bond->dev->name,
|
||||
slave->dev->name);
|
||||
|
||||
rtnl_lock();
|
||||
write_lock_bh(&bond->curr_slave_lock);
|
||||
|
||||
bond_select_active_slave(bond);
|
||||
|
|
@ -2974,8 +2973,6 @@ void bond_activebackup_arp_mon(struct work_struct *work)
|
|||
|
||||
write_unlock_bh(&bond->curr_slave_lock);
|
||||
|
||||
rtnl_unlock();
|
||||
|
||||
bond->current_arp_slave = slave;
|
||||
|
||||
if (slave) {
|
||||
|
|
@ -2993,13 +2990,10 @@ void bond_activebackup_arp_mon(struct work_struct *work)
|
|||
bond->primary_slave->dev->name);
|
||||
|
||||
/* primary is up so switch to it */
|
||||
rtnl_lock();
|
||||
write_lock_bh(&bond->curr_slave_lock);
|
||||
bond_change_active_slave(bond, bond->primary_slave);
|
||||
write_unlock_bh(&bond->curr_slave_lock);
|
||||
|
||||
rtnl_unlock();
|
||||
|
||||
slave = bond->primary_slave;
|
||||
slave->jiffies = jiffies;
|
||||
} else {
|
||||
|
|
@ -3769,42 +3763,45 @@ static struct net_device_stats *bond_get_stats(struct net_device *bond_dev)
|
|||
{
|
||||
struct bonding *bond = bond_dev->priv;
|
||||
struct net_device_stats *stats = &(bond->stats), *sstats;
|
||||
struct net_device_stats local_stats;
|
||||
struct slave *slave;
|
||||
int i;
|
||||
|
||||
memset(stats, 0, sizeof(struct net_device_stats));
|
||||
memset(&local_stats, 0, sizeof(struct net_device_stats));
|
||||
|
||||
read_lock_bh(&bond->lock);
|
||||
|
||||
bond_for_each_slave(bond, slave, i) {
|
||||
sstats = slave->dev->get_stats(slave->dev);
|
||||
stats->rx_packets += sstats->rx_packets;
|
||||
stats->rx_bytes += sstats->rx_bytes;
|
||||
stats->rx_errors += sstats->rx_errors;
|
||||
stats->rx_dropped += sstats->rx_dropped;
|
||||
local_stats.rx_packets += sstats->rx_packets;
|
||||
local_stats.rx_bytes += sstats->rx_bytes;
|
||||
local_stats.rx_errors += sstats->rx_errors;
|
||||
local_stats.rx_dropped += sstats->rx_dropped;
|
||||
|
||||
stats->tx_packets += sstats->tx_packets;
|
||||
stats->tx_bytes += sstats->tx_bytes;
|
||||
stats->tx_errors += sstats->tx_errors;
|
||||
stats->tx_dropped += sstats->tx_dropped;
|
||||
local_stats.tx_packets += sstats->tx_packets;
|
||||
local_stats.tx_bytes += sstats->tx_bytes;
|
||||
local_stats.tx_errors += sstats->tx_errors;
|
||||
local_stats.tx_dropped += sstats->tx_dropped;
|
||||
|
||||
stats->multicast += sstats->multicast;
|
||||
stats->collisions += sstats->collisions;
|
||||
local_stats.multicast += sstats->multicast;
|
||||
local_stats.collisions += sstats->collisions;
|
||||
|
||||
stats->rx_length_errors += sstats->rx_length_errors;
|
||||
stats->rx_over_errors += sstats->rx_over_errors;
|
||||
stats->rx_crc_errors += sstats->rx_crc_errors;
|
||||
stats->rx_frame_errors += sstats->rx_frame_errors;
|
||||
stats->rx_fifo_errors += sstats->rx_fifo_errors;
|
||||
stats->rx_missed_errors += sstats->rx_missed_errors;
|
||||
local_stats.rx_length_errors += sstats->rx_length_errors;
|
||||
local_stats.rx_over_errors += sstats->rx_over_errors;
|
||||
local_stats.rx_crc_errors += sstats->rx_crc_errors;
|
||||
local_stats.rx_frame_errors += sstats->rx_frame_errors;
|
||||
local_stats.rx_fifo_errors += sstats->rx_fifo_errors;
|
||||
local_stats.rx_missed_errors += sstats->rx_missed_errors;
|
||||
|
||||
stats->tx_aborted_errors += sstats->tx_aborted_errors;
|
||||
stats->tx_carrier_errors += sstats->tx_carrier_errors;
|
||||
stats->tx_fifo_errors += sstats->tx_fifo_errors;
|
||||
stats->tx_heartbeat_errors += sstats->tx_heartbeat_errors;
|
||||
stats->tx_window_errors += sstats->tx_window_errors;
|
||||
local_stats.tx_aborted_errors += sstats->tx_aborted_errors;
|
||||
local_stats.tx_carrier_errors += sstats->tx_carrier_errors;
|
||||
local_stats.tx_fifo_errors += sstats->tx_fifo_errors;
|
||||
local_stats.tx_heartbeat_errors += sstats->tx_heartbeat_errors;
|
||||
local_stats.tx_window_errors += sstats->tx_window_errors;
|
||||
}
|
||||
|
||||
memcpy(stats, &local_stats, sizeof(struct net_device_stats));
|
||||
|
||||
read_unlock_bh(&bond->lock);
|
||||
|
||||
return stats;
|
||||
|
|
@ -3937,8 +3934,6 @@ static void bond_set_multicast_list(struct net_device *bond_dev)
|
|||
struct bonding *bond = bond_dev->priv;
|
||||
struct dev_mc_list *dmi;
|
||||
|
||||
write_lock_bh(&bond->lock);
|
||||
|
||||
/*
|
||||
* Do promisc before checking multicast_mode
|
||||
*/
|
||||
|
|
@ -3959,6 +3954,8 @@ static void bond_set_multicast_list(struct net_device *bond_dev)
|
|||
bond_set_allmulti(bond, -1);
|
||||
}
|
||||
|
||||
read_lock(&bond->lock);
|
||||
|
||||
bond->flags = bond_dev->flags;
|
||||
|
||||
/* looking for addresses to add to slaves' mc list */
|
||||
|
|
@ -3979,7 +3976,7 @@ static void bond_set_multicast_list(struct net_device *bond_dev)
|
|||
bond_mc_list_destroy(bond);
|
||||
bond_mc_list_copy(bond_dev->mc_list, bond, GFP_ATOMIC);
|
||||
|
||||
write_unlock_bh(&bond->lock);
|
||||
read_unlock(&bond->lock);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -4526,7 +4523,9 @@ static void bond_free_all(void)
|
|||
struct net_device *bond_dev = bond->dev;
|
||||
|
||||
bond_work_cancel_all(bond);
|
||||
netif_tx_lock_bh(bond_dev);
|
||||
bond_mc_list_destroy(bond);
|
||||
netif_tx_unlock_bh(bond_dev);
|
||||
/* Release the bonded slaves */
|
||||
bond_release_all(bond_dev);
|
||||
bond_deinit(bond_dev);
|
||||
|
|
@ -4549,14 +4548,19 @@ static void bond_free_all(void)
|
|||
int bond_parse_parm(const char *buf, struct bond_parm_tbl *tbl)
|
||||
{
|
||||
int mode = -1, i, rv;
|
||||
char modestr[BOND_MAX_MODENAME_LEN + 1] = { 0, };
|
||||
char *p, modestr[BOND_MAX_MODENAME_LEN + 1] = { 0, };
|
||||
|
||||
rv = sscanf(buf, "%d", &mode);
|
||||
if (!rv) {
|
||||
for (p = (char *)buf; *p; p++)
|
||||
if (!(isdigit(*p) || isspace(*p)))
|
||||
break;
|
||||
|
||||
if (*p)
|
||||
rv = sscanf(buf, "%20s", modestr);
|
||||
if (!rv)
|
||||
return -1;
|
||||
}
|
||||
else
|
||||
rv = sscanf(buf, "%d", &mode);
|
||||
|
||||
if (!rv)
|
||||
return -1;
|
||||
|
||||
for (i = 0; tbl[i].modename; i++) {
|
||||
if (mode == tbl[i].mode)
|
||||
|
|
@ -4883,14 +4887,16 @@ int bond_create(char *name, struct bond_params *params, struct bonding **newbond
|
|||
down_write(&bonding_rwsem);
|
||||
|
||||
/* Check to see if the bond already exists. */
|
||||
list_for_each_entry_safe(bond, nxt, &bond_dev_list, bond_list)
|
||||
if (strnicmp(bond->dev->name, name, IFNAMSIZ) == 0) {
|
||||
printk(KERN_ERR DRV_NAME
|
||||
if (name) {
|
||||
list_for_each_entry_safe(bond, nxt, &bond_dev_list, bond_list)
|
||||
if (strnicmp(bond->dev->name, name, IFNAMSIZ) == 0) {
|
||||
printk(KERN_ERR DRV_NAME
|
||||
": cannot add bond %s; it already exists\n",
|
||||
name);
|
||||
res = -EPERM;
|
||||
goto out_rtnl;
|
||||
}
|
||||
name);
|
||||
res = -EPERM;
|
||||
goto out_rtnl;
|
||||
}
|
||||
}
|
||||
|
||||
bond_dev = alloc_netdev(sizeof(struct bonding), name ? name : "",
|
||||
ether_setup);
|
||||
|
|
|
|||
|
|
@ -22,8 +22,8 @@
|
|||
#include "bond_3ad.h"
|
||||
#include "bond_alb.h"
|
||||
|
||||
#define DRV_VERSION "3.2.3"
|
||||
#define DRV_RELDATE "December 6, 2007"
|
||||
#define DRV_VERSION "3.2.4"
|
||||
#define DRV_RELDATE "January 28, 2008"
|
||||
#define DRV_NAME "bonding"
|
||||
#define DRV_DESCRIPTION "Ethernet Channel Bonding Driver"
|
||||
|
||||
|
|
|
|||
|
|
@ -452,7 +452,7 @@ void t3_mc5_intr_handler(struct mc5 *mc5)
|
|||
t3_write_reg(adap, A_MC5_DB_INT_CAUSE, cause);
|
||||
}
|
||||
|
||||
void __devinit t3_mc5_prep(struct adapter *adapter, struct mc5 *mc5, int mode)
|
||||
void t3_mc5_prep(struct adapter *adapter, struct mc5 *mc5, int mode)
|
||||
{
|
||||
#define K * 1024
|
||||
|
||||
|
|
|
|||
|
|
@ -2836,7 +2836,7 @@ void t3_sge_init(struct adapter *adap, struct sge_params *p)
|
|||
* defaults for the assorted SGE parameters, which admins can change until
|
||||
* they are used to initialize the SGE.
|
||||
*/
|
||||
void __devinit t3_sge_prep(struct adapter *adap, struct sge_params *p)
|
||||
void t3_sge_prep(struct adapter *adap, struct sge_params *p)
|
||||
{
|
||||
int i;
|
||||
|
||||
|
|
|
|||
|
|
@ -2675,7 +2675,7 @@ void t3_tp_set_max_rxsize(struct adapter *adap, unsigned int size)
|
|||
V_PMMAXXFERLEN0(size) | V_PMMAXXFERLEN1(size));
|
||||
}
|
||||
|
||||
static void __devinit init_mtus(unsigned short mtus[])
|
||||
static void init_mtus(unsigned short mtus[])
|
||||
{
|
||||
/*
|
||||
* See draft-mathis-plpmtud-00.txt for the values. The min is 88 so
|
||||
|
|
@ -2703,7 +2703,7 @@ static void __devinit init_mtus(unsigned short mtus[])
|
|||
/*
|
||||
* Initial congestion control parameters.
|
||||
*/
|
||||
static void __devinit init_cong_ctrl(unsigned short *a, unsigned short *b)
|
||||
static void init_cong_ctrl(unsigned short *a, unsigned short *b)
|
||||
{
|
||||
a[0] = a[1] = a[2] = a[3] = a[4] = a[5] = a[6] = a[7] = a[8] = 1;
|
||||
a[9] = 2;
|
||||
|
|
@ -3354,8 +3354,7 @@ out_err:
|
|||
* Determines a card's PCI mode and associated parameters, such as speed
|
||||
* and width.
|
||||
*/
|
||||
static void __devinit get_pci_mode(struct adapter *adapter,
|
||||
struct pci_params *p)
|
||||
static void get_pci_mode(struct adapter *adapter, struct pci_params *p)
|
||||
{
|
||||
static unsigned short speed_map[] = { 33, 66, 100, 133 };
|
||||
u32 pci_mode, pcie_cap;
|
||||
|
|
@ -3395,8 +3394,7 @@ static void __devinit get_pci_mode(struct adapter *adapter,
|
|||
* capabilities and default speed/duplex/flow-control/autonegotiation
|
||||
* settings.
|
||||
*/
|
||||
static void __devinit init_link_config(struct link_config *lc,
|
||||
unsigned int caps)
|
||||
static void init_link_config(struct link_config *lc, unsigned int caps)
|
||||
{
|
||||
lc->supported = caps;
|
||||
lc->requested_speed = lc->speed = SPEED_INVALID;
|
||||
|
|
@ -3419,7 +3417,7 @@ static void __devinit init_link_config(struct link_config *lc,
|
|||
* Calculates the size of an MC7 memory in bytes from the value of its
|
||||
* configuration register.
|
||||
*/
|
||||
static unsigned int __devinit mc7_calc_size(u32 cfg)
|
||||
static unsigned int mc7_calc_size(u32 cfg)
|
||||
{
|
||||
unsigned int width = G_WIDTH(cfg);
|
||||
unsigned int banks = !!(cfg & F_BKS) + 1;
|
||||
|
|
@ -3430,8 +3428,8 @@ static unsigned int __devinit mc7_calc_size(u32 cfg)
|
|||
return MBs << 20;
|
||||
}
|
||||
|
||||
static void __devinit mc7_prep(struct adapter *adapter, struct mc7 *mc7,
|
||||
unsigned int base_addr, const char *name)
|
||||
static void mc7_prep(struct adapter *adapter, struct mc7 *mc7,
|
||||
unsigned int base_addr, const char *name)
|
||||
{
|
||||
u32 cfg;
|
||||
|
||||
|
|
@ -3517,7 +3515,7 @@ static int t3_reset_adapter(struct adapter *adapter)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int __devinit init_parity(struct adapter *adap)
|
||||
static int init_parity(struct adapter *adap)
|
||||
{
|
||||
int i, err, addr;
|
||||
|
||||
|
|
@ -3552,8 +3550,8 @@ static int __devinit init_parity(struct adapter *adap)
|
|||
* for some adapter tunables, take PHYs out of reset, and initialize the MDIO
|
||||
* interface.
|
||||
*/
|
||||
int __devinit t3_prep_adapter(struct adapter *adapter,
|
||||
const struct adapter_info *ai, int reset)
|
||||
int t3_prep_adapter(struct adapter *adapter, const struct adapter_info *ai,
|
||||
int reset)
|
||||
{
|
||||
int ret;
|
||||
unsigned int i, j = 0;
|
||||
|
|
|
|||
|
|
@ -94,7 +94,7 @@
|
|||
* enabled. 82557 pads with 7Eh, while the later controllers pad
|
||||
* with 00h.
|
||||
*
|
||||
* IV. Recieve
|
||||
* IV. Receive
|
||||
*
|
||||
* The Receive Frame Area (RFA) comprises a ring of Receive Frame
|
||||
* Descriptors (RFD) + data buffer, thus forming the simplified mode
|
||||
|
|
@ -120,7 +120,7 @@
|
|||
* and Rx indication and re-allocation happen in the same context,
|
||||
* therefore no locking is required. A software-generated interrupt
|
||||
* is generated from the watchdog to recover from a failed allocation
|
||||
* senario where all Rx resources have been indicated and none re-
|
||||
* scenario where all Rx resources have been indicated and none re-
|
||||
* placed.
|
||||
*
|
||||
* V. Miscellaneous
|
||||
|
|
@ -954,7 +954,7 @@ static void e100_get_defaults(struct nic *nic)
|
|||
/* Quadwords to DMA into FIFO before starting frame transmit */
|
||||
nic->tx_threshold = 0xE0;
|
||||
|
||||
/* no interrupt for every tx completion, delay = 256us if not 557*/
|
||||
/* no interrupt for every tx completion, delay = 256us if not 557 */
|
||||
nic->tx_command = cpu_to_le16(cb_tx | cb_tx_sf |
|
||||
((nic->mac >= mac_82558_D101_A4) ? cb_cid : cb_i));
|
||||
|
||||
|
|
@ -1497,7 +1497,7 @@ static void e100_update_stats(struct nic *nic)
|
|||
&s->complete;
|
||||
|
||||
/* Device's stats reporting may take several microseconds to
|
||||
* complete, so where always waiting for results of the
|
||||
* complete, so we're always waiting for results of the
|
||||
* previous command. */
|
||||
|
||||
if(*complete == cpu_to_le32(cuc_dump_reset_complete)) {
|
||||
|
|
@ -1958,7 +1958,7 @@ static void e100_rx_clean(struct nic *nic, unsigned int *work_done,
|
|||
|
||||
if(restart_required) {
|
||||
// ack the rnr?
|
||||
writeb(stat_ack_rnr, &nic->csr->scb.stat_ack);
|
||||
iowrite8(stat_ack_rnr, &nic->csr->scb.stat_ack);
|
||||
e100_start_receiver(nic, nic->rx_to_clean);
|
||||
if(work_done)
|
||||
(*work_done)++;
|
||||
|
|
@ -2774,7 +2774,7 @@ static void __devexit e100_remove(struct pci_dev *pdev)
|
|||
struct nic *nic = netdev_priv(netdev);
|
||||
unregister_netdev(netdev);
|
||||
e100_free(nic);
|
||||
iounmap(nic->csr);
|
||||
pci_iounmap(pdev, nic->csr);
|
||||
free_netdev(netdev);
|
||||
pci_release_regions(pdev);
|
||||
pci_disable_device(pdev);
|
||||
|
|
@ -2858,17 +2858,17 @@ static void e100_shutdown(struct pci_dev *pdev)
|
|||
/**
|
||||
* e100_io_error_detected - called when PCI error is detected.
|
||||
* @pdev: Pointer to PCI device
|
||||
* @state: The current pci conneection state
|
||||
* @state: The current pci connection state
|
||||
*/
|
||||
static pci_ers_result_t e100_io_error_detected(struct pci_dev *pdev, pci_channel_state_t state)
|
||||
{
|
||||
struct net_device *netdev = pci_get_drvdata(pdev);
|
||||
struct nic *nic = netdev_priv(netdev);
|
||||
|
||||
/* Similar to calling e100_down(), but avoids adpater I/O. */
|
||||
/* Similar to calling e100_down(), but avoids adapter I/O. */
|
||||
netdev->stop(netdev);
|
||||
|
||||
/* Detach; put netif into state similar to hotplug unplug. */
|
||||
/* Detach; put netif into a state similar to hotplug unplug. */
|
||||
napi_enable(&nic->napi);
|
||||
netif_device_detach(netdev);
|
||||
pci_disable_device(pdev);
|
||||
|
|
|
|||
|
|
@ -853,7 +853,7 @@ e1000_reset(struct e1000_adapter *adapter)
|
|||
/**
|
||||
* Dump the eeprom for users having checksum issues
|
||||
**/
|
||||
void e1000_dump_eeprom(struct e1000_adapter *adapter)
|
||||
static void e1000_dump_eeprom(struct e1000_adapter *adapter)
|
||||
{
|
||||
struct net_device *netdev = adapter->netdev;
|
||||
struct ethtool_eeprom eeprom;
|
||||
|
|
|
|||
|
|
@ -63,6 +63,7 @@
|
|||
#define E1000_WUFC_EX 0x00000004 /* Directed Exact Wakeup Enable */
|
||||
#define E1000_WUFC_MC 0x00000008 /* Directed Multicast Wakeup Enable */
|
||||
#define E1000_WUFC_BC 0x00000010 /* Broadcast Wakeup Enable */
|
||||
#define E1000_WUFC_ARP 0x00000020 /* ARP Request Packet Wakeup Enable */
|
||||
|
||||
/* Extended Device Control */
|
||||
#define E1000_CTRL_EXT_SDP7_DATA 0x00000080 /* Value of SW Defineable Pin 7 */
|
||||
|
|
|
|||
|
|
@ -690,8 +690,8 @@ err_setup:
|
|||
return err;
|
||||
}
|
||||
|
||||
bool reg_pattern_test_array(struct e1000_adapter *adapter, u64 *data,
|
||||
int reg, int offset, u32 mask, u32 write)
|
||||
static bool reg_pattern_test_array(struct e1000_adapter *adapter, u64 *data,
|
||||
int reg, int offset, u32 mask, u32 write)
|
||||
{
|
||||
int i;
|
||||
u32 read;
|
||||
|
|
@ -1632,7 +1632,8 @@ static void e1000_get_wol(struct net_device *netdev,
|
|||
return;
|
||||
|
||||
wol->supported = WAKE_UCAST | WAKE_MCAST |
|
||||
WAKE_BCAST | WAKE_MAGIC;
|
||||
WAKE_BCAST | WAKE_MAGIC |
|
||||
WAKE_PHY | WAKE_ARP;
|
||||
|
||||
/* apply any specific unsupported masks here */
|
||||
if (adapter->flags & FLAG_NO_WAKE_UCAST) {
|
||||
|
|
@ -1651,6 +1652,10 @@ static void e1000_get_wol(struct net_device *netdev,
|
|||
wol->wolopts |= WAKE_BCAST;
|
||||
if (adapter->wol & E1000_WUFC_MAG)
|
||||
wol->wolopts |= WAKE_MAGIC;
|
||||
if (adapter->wol & E1000_WUFC_LNKC)
|
||||
wol->wolopts |= WAKE_PHY;
|
||||
if (adapter->wol & E1000_WUFC_ARP)
|
||||
wol->wolopts |= WAKE_ARP;
|
||||
}
|
||||
|
||||
static int e1000_set_wol(struct net_device *netdev,
|
||||
|
|
@ -1658,7 +1663,7 @@ static int e1000_set_wol(struct net_device *netdev,
|
|||
{
|
||||
struct e1000_adapter *adapter = netdev_priv(netdev);
|
||||
|
||||
if (wol->wolopts & (WAKE_PHY | WAKE_ARP | WAKE_MAGICSECURE))
|
||||
if (wol->wolopts & WAKE_MAGICSECURE)
|
||||
return -EOPNOTSUPP;
|
||||
|
||||
if (!(adapter->flags & FLAG_HAS_WOL))
|
||||
|
|
@ -1675,6 +1680,10 @@ static int e1000_set_wol(struct net_device *netdev,
|
|||
adapter->wol |= E1000_WUFC_BC;
|
||||
if (wol->wolopts & WAKE_MAGIC)
|
||||
adapter->wol |= E1000_WUFC_MAG;
|
||||
if (wol->wolopts & WAKE_PHY)
|
||||
adapter->wol |= E1000_WUFC_LNKC;
|
||||
if (wol->wolopts & WAKE_ARP)
|
||||
adapter->wol |= E1000_WUFC_ARP;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -945,11 +945,7 @@ static int e1000_request_irq(struct e1000_adapter *adapter)
|
|||
int irq_flags = IRQF_SHARED;
|
||||
int err;
|
||||
|
||||
err = pci_enable_msi(adapter->pdev);
|
||||
if (err) {
|
||||
ndev_warn(netdev,
|
||||
"Unable to allocate MSI interrupt Error: %d\n", err);
|
||||
} else {
|
||||
if (!pci_enable_msi(adapter->pdev)) {
|
||||
adapter->flags |= FLAG_MSI_ENABLED;
|
||||
handler = e1000_intr_msi;
|
||||
irq_flags = 0;
|
||||
|
|
@ -958,10 +954,12 @@ static int e1000_request_irq(struct e1000_adapter *adapter)
|
|||
err = request_irq(adapter->pdev->irq, handler, irq_flags, netdev->name,
|
||||
netdev);
|
||||
if (err) {
|
||||
ndev_err(netdev,
|
||||
"Unable to allocate %s interrupt (return: %d)\n",
|
||||
adapter->flags & FLAG_MSI_ENABLED ? "MSI":"INTx",
|
||||
err);
|
||||
if (adapter->flags & FLAG_MSI_ENABLED)
|
||||
pci_disable_msi(adapter->pdev);
|
||||
ndev_err(netdev,
|
||||
"Unable to allocate interrupt Error: %d\n", err);
|
||||
}
|
||||
|
||||
return err;
|
||||
|
|
|
|||
|
|
@ -458,4 +458,7 @@ void ehea_set_ethtool_ops(struct net_device *netdev);
|
|||
int ehea_sense_port_attr(struct ehea_port *port);
|
||||
int ehea_set_portspeed(struct ehea_port *port, u32 port_speed);
|
||||
|
||||
extern u64 ehea_driver_flags;
|
||||
extern struct work_struct ehea_rereg_mr_task;
|
||||
|
||||
#endif /* __EHEA_H__ */
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ static int ehea_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
|
|||
return ret;
|
||||
|
||||
if (netif_carrier_ok(dev)) {
|
||||
switch(port->port_speed) {
|
||||
switch (port->port_speed) {
|
||||
case EHEA_SPEED_10M: cmd->speed = SPEED_10; break;
|
||||
case EHEA_SPEED_100M: cmd->speed = SPEED_100; break;
|
||||
case EHEA_SPEED_1G: cmd->speed = SPEED_1000; break;
|
||||
|
|
@ -78,7 +78,7 @@ static int ehea_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
|
|||
goto doit;
|
||||
}
|
||||
|
||||
switch(cmd->speed) {
|
||||
switch (cmd->speed) {
|
||||
case SPEED_10:
|
||||
if (cmd->duplex == DUPLEX_FULL)
|
||||
sp = H_SPEED_10M_F;
|
||||
|
|
|
|||
|
|
@ -29,10 +29,10 @@
|
|||
#ifndef __EHEA_HW_H__
|
||||
#define __EHEA_HW_H__
|
||||
|
||||
#define QPX_SQA_VALUE EHEA_BMASK_IBM(48,63)
|
||||
#define QPX_RQ1A_VALUE EHEA_BMASK_IBM(48,63)
|
||||
#define QPX_RQ2A_VALUE EHEA_BMASK_IBM(48,63)
|
||||
#define QPX_RQ3A_VALUE EHEA_BMASK_IBM(48,63)
|
||||
#define QPX_SQA_VALUE EHEA_BMASK_IBM(48, 63)
|
||||
#define QPX_RQ1A_VALUE EHEA_BMASK_IBM(48, 63)
|
||||
#define QPX_RQ2A_VALUE EHEA_BMASK_IBM(48, 63)
|
||||
#define QPX_RQ3A_VALUE EHEA_BMASK_IBM(48, 63)
|
||||
|
||||
#define QPTEMM_OFFSET(x) offsetof(struct ehea_qptemm, x)
|
||||
|
||||
|
|
|
|||
|
|
@ -6,9 +6,9 @@
|
|||
* (C) Copyright IBM Corp. 2006
|
||||
*
|
||||
* Authors:
|
||||
* Christoph Raisch <raisch@de.ibm.com>
|
||||
* Jan-Bernd Themann <themann@de.ibm.com>
|
||||
* Thomas Klein <tklein@de.ibm.com>
|
||||
* Christoph Raisch <raisch@de.ibm.com>
|
||||
* Jan-Bernd Themann <themann@de.ibm.com>
|
||||
* Thomas Klein <tklein@de.ibm.com>
|
||||
*
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
|
|
@ -54,11 +54,11 @@ static int rq1_entries = EHEA_DEF_ENTRIES_RQ1;
|
|||
static int rq2_entries = EHEA_DEF_ENTRIES_RQ2;
|
||||
static int rq3_entries = EHEA_DEF_ENTRIES_RQ3;
|
||||
static int sq_entries = EHEA_DEF_ENTRIES_SQ;
|
||||
static int use_mcs = 0;
|
||||
static int use_lro = 0;
|
||||
static int use_mcs;
|
||||
static int use_lro;
|
||||
static int lro_max_aggr = EHEA_LRO_MAX_AGGR;
|
||||
static int num_tx_qps = EHEA_NUM_TX_QP;
|
||||
static int prop_carrier_state = 0;
|
||||
static int prop_carrier_state;
|
||||
|
||||
module_param(msg_level, int, 0);
|
||||
module_param(rq1_entries, int, 0);
|
||||
|
|
@ -94,9 +94,9 @@ MODULE_PARM_DESC(lro_max_aggr, " LRO: Max packets to be aggregated. Default = "
|
|||
MODULE_PARM_DESC(use_lro, " Large Receive Offload, 1: enable, 0: disable, "
|
||||
"Default = 0");
|
||||
|
||||
static int port_name_cnt = 0;
|
||||
static int port_name_cnt;
|
||||
static LIST_HEAD(adapter_list);
|
||||
u64 ehea_driver_flags = 0;
|
||||
u64 ehea_driver_flags;
|
||||
struct work_struct ehea_rereg_mr_task;
|
||||
|
||||
struct semaphore dlpar_mem_lock;
|
||||
|
|
@ -121,12 +121,13 @@ static struct of_platform_driver ehea_driver = {
|
|||
.remove = ehea_remove,
|
||||
};
|
||||
|
||||
void ehea_dump(void *adr, int len, char *msg) {
|
||||
void ehea_dump(void *adr, int len, char *msg)
|
||||
{
|
||||
int x;
|
||||
unsigned char *deb = adr;
|
||||
for (x = 0; x < len; x += 16) {
|
||||
printk(DRV_NAME " %s adr=%p ofs=%04x %016lx %016lx\n", msg,
|
||||
deb, x, *((u64*)&deb[0]), *((u64*)&deb[8]));
|
||||
deb, x, *((u64 *)&deb[0]), *((u64 *)&deb[8]));
|
||||
deb += 16;
|
||||
}
|
||||
}
|
||||
|
|
@ -518,7 +519,8 @@ static int ehea_proc_rwqes(struct net_device *dev,
|
|||
last_wqe_index = wqe_index;
|
||||
rmb();
|
||||
if (!ehea_check_cqe(cqe, &rq)) {
|
||||
if (rq == 1) { /* LL RQ1 */
|
||||
if (rq == 1) {
|
||||
/* LL RQ1 */
|
||||
skb = get_skb_by_index_ll(skb_arr_rq1,
|
||||
skb_arr_rq1_len,
|
||||
wqe_index);
|
||||
|
|
@ -531,10 +533,11 @@ static int ehea_proc_rwqes(struct net_device *dev,
|
|||
if (!skb)
|
||||
break;
|
||||
}
|
||||
skb_copy_to_linear_data(skb, ((char*)cqe) + 64,
|
||||
skb_copy_to_linear_data(skb, ((char *)cqe) + 64,
|
||||
cqe->num_bytes_transfered - 4);
|
||||
ehea_fill_skb(dev, skb, cqe);
|
||||
} else if (rq == 2) { /* RQ2 */
|
||||
} else if (rq == 2) {
|
||||
/* RQ2 */
|
||||
skb = get_skb_by_index(skb_arr_rq2,
|
||||
skb_arr_rq2_len, cqe);
|
||||
if (unlikely(!skb)) {
|
||||
|
|
@ -544,7 +547,8 @@ static int ehea_proc_rwqes(struct net_device *dev,
|
|||
}
|
||||
ehea_fill_skb(dev, skb, cqe);
|
||||
processed_rq2++;
|
||||
} else { /* RQ3 */
|
||||
} else {
|
||||
/* RQ3 */
|
||||
skb = get_skb_by_index(skb_arr_rq3,
|
||||
skb_arr_rq3_len, cqe);
|
||||
if (unlikely(!skb)) {
|
||||
|
|
@ -592,7 +596,7 @@ static struct ehea_cqe *ehea_proc_cqes(struct ehea_port_res *pr, int my_quota)
|
|||
unsigned long flags;
|
||||
|
||||
cqe = ehea_poll_cq(send_cq);
|
||||
while(cqe && (quota > 0)) {
|
||||
while (cqe && (quota > 0)) {
|
||||
ehea_inc_cq(send_cq);
|
||||
|
||||
cqe_counter++;
|
||||
|
|
@ -643,7 +647,8 @@ static struct ehea_cqe *ehea_proc_cqes(struct ehea_port_res *pr, int my_quota)
|
|||
|
||||
static int ehea_poll(struct napi_struct *napi, int budget)
|
||||
{
|
||||
struct ehea_port_res *pr = container_of(napi, struct ehea_port_res, napi);
|
||||
struct ehea_port_res *pr = container_of(napi, struct ehea_port_res,
|
||||
napi);
|
||||
struct net_device *dev = pr->port->netdev;
|
||||
struct ehea_cqe *cqe;
|
||||
struct ehea_cqe *cqe_skb = NULL;
|
||||
|
|
@ -743,8 +748,9 @@ int ehea_sense_port_attr(struct ehea_port *port)
|
|||
u64 hret;
|
||||
struct hcp_ehea_port_cb0 *cb0;
|
||||
|
||||
cb0 = kzalloc(PAGE_SIZE, GFP_ATOMIC); /* May be called via */
|
||||
if (!cb0) { /* ehea_neq_tasklet() */
|
||||
/* may be called via ehea_neq_tasklet() */
|
||||
cb0 = kzalloc(PAGE_SIZE, GFP_ATOMIC);
|
||||
if (!cb0) {
|
||||
ehea_error("no mem for cb0");
|
||||
ret = -ENOMEM;
|
||||
goto out;
|
||||
|
|
@ -762,7 +768,7 @@ int ehea_sense_port_attr(struct ehea_port *port)
|
|||
/* MAC address */
|
||||
port->mac_addr = cb0->port_mac_addr << 16;
|
||||
|
||||
if (!is_valid_ether_addr((u8*)&port->mac_addr)) {
|
||||
if (!is_valid_ether_addr((u8 *)&port->mac_addr)) {
|
||||
ret = -EADDRNOTAVAIL;
|
||||
goto out_free;
|
||||
}
|
||||
|
|
@ -994,7 +1000,7 @@ static void ehea_parse_eqe(struct ehea_adapter *adapter, u64 eqe)
|
|||
|
||||
static void ehea_neq_tasklet(unsigned long data)
|
||||
{
|
||||
struct ehea_adapter *adapter = (struct ehea_adapter*)data;
|
||||
struct ehea_adapter *adapter = (struct ehea_adapter *)data;
|
||||
struct ehea_eqe *eqe;
|
||||
u64 event_mask;
|
||||
|
||||
|
|
@ -1204,7 +1210,7 @@ int ehea_rem_smrs(struct ehea_port_res *pr)
|
|||
|
||||
static int ehea_init_q_skba(struct ehea_q_skb_arr *q_skba, int max_q_entries)
|
||||
{
|
||||
int arr_size = sizeof(void*) * max_q_entries;
|
||||
int arr_size = sizeof(void *) * max_q_entries;
|
||||
|
||||
q_skba->arr = vmalloc(arr_size);
|
||||
if (!q_skba->arr)
|
||||
|
|
@ -1489,7 +1495,7 @@ static inline void write_swqe2_data(struct sk_buff *skb, struct net_device *dev,
|
|||
|
||||
nfrags = skb_shinfo(skb)->nr_frags;
|
||||
sg1entry = &swqe->u.immdata_desc.sg_entry;
|
||||
sg_list = (struct ehea_vsgentry*)&swqe->u.immdata_desc.sg_list;
|
||||
sg_list = (struct ehea_vsgentry *)&swqe->u.immdata_desc.sg_list;
|
||||
swqe->descriptors = 0;
|
||||
sg1entry_contains_frag_data = 0;
|
||||
|
||||
|
|
@ -1542,7 +1548,7 @@ static int ehea_broadcast_reg_helper(struct ehea_port *port, u32 hcallid)
|
|||
reg_type, port->mac_addr, 0, hcallid);
|
||||
if (hret != H_SUCCESS) {
|
||||
ehea_error("%sregistering bc address failed (tagged)",
|
||||
hcallid == H_REG_BCMC ? "" : "de");
|
||||
hcallid == H_REG_BCMC ? "" : "de");
|
||||
ret = -EIO;
|
||||
goto out_herr;
|
||||
}
|
||||
|
|
@ -1732,7 +1738,7 @@ static void ehea_allmulti(struct net_device *dev, int enable)
|
|||
}
|
||||
}
|
||||
|
||||
static void ehea_add_multicast_entry(struct ehea_port* port, u8* mc_mac_addr)
|
||||
static void ehea_add_multicast_entry(struct ehea_port *port, u8 *mc_mac_addr)
|
||||
{
|
||||
struct ehea_mc_list *ehea_mcl_entry;
|
||||
u64 hret;
|
||||
|
|
@ -1791,11 +1797,10 @@ static void ehea_set_multicast_list(struct net_device *dev)
|
|||
goto out;
|
||||
}
|
||||
|
||||
for (i = 0, k_mcl_entry = dev->mc_list;
|
||||
i < dev->mc_count;
|
||||
i++, k_mcl_entry = k_mcl_entry->next) {
|
||||
for (i = 0, k_mcl_entry = dev->mc_list; i < dev->mc_count; i++,
|
||||
k_mcl_entry = k_mcl_entry->next)
|
||||
ehea_add_multicast_entry(port, k_mcl_entry->dmi_addr);
|
||||
}
|
||||
|
||||
}
|
||||
out:
|
||||
return;
|
||||
|
|
@ -1925,12 +1930,12 @@ static inline int ehea_hash_skb(struct sk_buff *skb, int num_qps)
|
|||
|
||||
if ((skb->protocol == htons(ETH_P_IP)) &&
|
||||
(ip_hdr(skb)->protocol == IPPROTO_TCP)) {
|
||||
tcp = (struct tcphdr*)(skb_network_header(skb) + (ip_hdr(skb)->ihl * 4));
|
||||
tcp = (struct tcphdr *)(skb_network_header(skb) +
|
||||
(ip_hdr(skb)->ihl * 4));
|
||||
tmp = (tcp->source + (tcp->dest << 16)) % 31;
|
||||
tmp += ip_hdr(skb)->daddr % 31;
|
||||
return tmp % num_qps;
|
||||
}
|
||||
else
|
||||
} else
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -2122,7 +2127,7 @@ int ehea_activate_qp(struct ehea_adapter *adapter, struct ehea_qp *qp)
|
|||
u64 hret;
|
||||
u16 dummy16 = 0;
|
||||
u64 dummy64 = 0;
|
||||
struct hcp_modify_qp_cb0* cb0;
|
||||
struct hcp_modify_qp_cb0 *cb0;
|
||||
|
||||
cb0 = kzalloc(PAGE_SIZE, GFP_KERNEL);
|
||||
if (!cb0) {
|
||||
|
|
@ -2248,7 +2253,7 @@ static int ehea_clean_all_portres(struct ehea_port *port)
|
|||
int ret = 0;
|
||||
int i;
|
||||
|
||||
for(i = 0; i < port->num_def_qps + port->num_add_tx_qps; i++)
|
||||
for (i = 0; i < port->num_def_qps + port->num_add_tx_qps; i++)
|
||||
ret |= ehea_clean_portres(port, &port->port_res[i]);
|
||||
|
||||
ret |= ehea_destroy_eq(port->qp_eq);
|
||||
|
|
@ -2300,7 +2305,7 @@ static int ehea_up(struct net_device *dev)
|
|||
goto out_clean_pr;
|
||||
}
|
||||
|
||||
for(i = 0; i < port->num_def_qps + port->num_add_tx_qps; i++) {
|
||||
for (i = 0; i < port->num_def_qps + port->num_add_tx_qps; i++) {
|
||||
ret = ehea_activate_qp(port->adapter, port->port_res[i].qp);
|
||||
if (ret) {
|
||||
ehea_error("activate_qp failed");
|
||||
|
|
@ -2308,7 +2313,7 @@ static int ehea_up(struct net_device *dev)
|
|||
}
|
||||
}
|
||||
|
||||
for(i = 0; i < port->num_def_qps; i++) {
|
||||
for (i = 0; i < port->num_def_qps; i++) {
|
||||
ret = ehea_fill_port_res(&port->port_res[i]);
|
||||
if (ret) {
|
||||
ehea_error("out_free_irqs");
|
||||
|
|
@ -2425,7 +2430,7 @@ int ehea_stop_qps(struct net_device *dev)
|
|||
{
|
||||
struct ehea_port *port = netdev_priv(dev);
|
||||
struct ehea_adapter *adapter = port->adapter;
|
||||
struct hcp_modify_qp_cb0* cb0;
|
||||
struct hcp_modify_qp_cb0 *cb0;
|
||||
int ret = -EIO;
|
||||
int dret;
|
||||
int i;
|
||||
|
|
@ -2490,7 +2495,7 @@ out:
|
|||
return ret;
|
||||
}
|
||||
|
||||
void ehea_update_rqs(struct ehea_qp *orig_qp, struct ehea_port_res * pr)
|
||||
void ehea_update_rqs(struct ehea_qp *orig_qp, struct ehea_port_res *pr)
|
||||
{
|
||||
struct ehea_qp qp = *orig_qp;
|
||||
struct ehea_qp_init_attr *init_attr = &qp.init_attr;
|
||||
|
|
@ -2530,7 +2535,7 @@ int ehea_restart_qps(struct net_device *dev)
|
|||
int ret = 0;
|
||||
int i;
|
||||
|
||||
struct hcp_modify_qp_cb0* cb0;
|
||||
struct hcp_modify_qp_cb0 *cb0;
|
||||
u64 hret;
|
||||
u64 dummy64 = 0;
|
||||
u16 dummy16 = 0;
|
||||
|
|
@ -2804,34 +2809,6 @@ static void __devinit logical_port_release(struct device *dev)
|
|||
of_node_put(port->ofdev.node);
|
||||
}
|
||||
|
||||
static int ehea_driver_sysfs_add(struct device *dev,
|
||||
struct device_driver *driver)
|
||||
{
|
||||
int ret;
|
||||
|
||||
ret = sysfs_create_link(&driver->kobj, &dev->kobj,
|
||||
kobject_name(&dev->kobj));
|
||||
if (ret == 0) {
|
||||
ret = sysfs_create_link(&dev->kobj, &driver->kobj,
|
||||
"driver");
|
||||
if (ret)
|
||||
sysfs_remove_link(&driver->kobj,
|
||||
kobject_name(&dev->kobj));
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
static void ehea_driver_sysfs_remove(struct device *dev,
|
||||
struct device_driver *driver)
|
||||
{
|
||||
struct device_driver *drv = driver;
|
||||
|
||||
if (drv) {
|
||||
sysfs_remove_link(&drv->kobj, kobject_name(&dev->kobj));
|
||||
sysfs_remove_link(&dev->kobj, "driver");
|
||||
}
|
||||
}
|
||||
|
||||
static struct device *ehea_register_port(struct ehea_port *port,
|
||||
struct device_node *dn)
|
||||
{
|
||||
|
|
@ -2856,16 +2833,8 @@ static struct device *ehea_register_port(struct ehea_port *port,
|
|||
goto out_unreg_of_dev;
|
||||
}
|
||||
|
||||
ret = ehea_driver_sysfs_add(&port->ofdev.dev, &ehea_driver.driver);
|
||||
if (ret) {
|
||||
ehea_error("failed to register sysfs driver link");
|
||||
goto out_rem_dev_file;
|
||||
}
|
||||
|
||||
return &port->ofdev.dev;
|
||||
|
||||
out_rem_dev_file:
|
||||
device_remove_file(&port->ofdev.dev, &dev_attr_log_port_id);
|
||||
out_unreg_of_dev:
|
||||
of_device_unregister(&port->ofdev);
|
||||
out:
|
||||
|
|
@ -2874,7 +2843,6 @@ out:
|
|||
|
||||
static void ehea_unregister_port(struct ehea_port *port)
|
||||
{
|
||||
ehea_driver_sysfs_remove(&port->ofdev.dev, &ehea_driver.driver);
|
||||
device_remove_file(&port->ofdev.dev, &dev_attr_log_port_id);
|
||||
of_device_unregister(&port->ofdev);
|
||||
}
|
||||
|
|
@ -3109,7 +3077,7 @@ static ssize_t ehea_probe_port(struct device *dev,
|
|||
of_node_put(eth_dn);
|
||||
|
||||
if (port) {
|
||||
for (i=0; i < EHEA_MAX_PORTS; i++)
|
||||
for (i = 0; i < EHEA_MAX_PORTS; i++)
|
||||
if (!adapter->port[i]) {
|
||||
adapter->port[i] = port;
|
||||
break;
|
||||
|
|
@ -3144,7 +3112,7 @@ static ssize_t ehea_remove_port(struct device *dev,
|
|||
|
||||
ehea_shutdown_single_port(port);
|
||||
|
||||
for (i=0; i < EHEA_MAX_PORTS; i++)
|
||||
for (i = 0; i < EHEA_MAX_PORTS; i++)
|
||||
if (adapter->port[i] == port) {
|
||||
adapter->port[i] = NULL;
|
||||
break;
|
||||
|
|
@ -3313,7 +3281,7 @@ static int ehea_reboot_notifier(struct notifier_block *nb,
|
|||
}
|
||||
|
||||
static struct notifier_block ehea_reboot_nb = {
|
||||
.notifier_call = ehea_reboot_notifier,
|
||||
.notifier_call = ehea_reboot_notifier,
|
||||
};
|
||||
|
||||
static int check_module_parm(void)
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue