Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 78949
b: refs/heads/master
c: 4790654
h: refs/heads/master
i:
  78947: 7db71b9
v: v3
  • Loading branch information
Jeff Garzik authored and David S. Miller committed Jan 28, 2008
1 parent bec2a0b commit 06e9787
Show file tree
Hide file tree
Showing 10 changed files with 80 additions and 80 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ba734f349d5ba02a736e2d574584c56cd21bad14
refs/heads/master: 4790654c71b250018ecc234f6b9f1ed96a55572d
16 changes: 8 additions & 8 deletions trunk/drivers/net/netxen/netxen_nic.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,8 @@
#define FLUSH_SCHEDULED_WORK() flush_workqueue(netxen_workq)
extern struct workqueue_struct *netxen_workq;

/*
* normalize a 64MB crb address to 32MB PCI window
/*
* normalize a 64MB crb address to 32MB PCI window
* To use NETXEN_CRB_NORMALIZE, window _must_ be set to 1
*/
#define NETXEN_CRB_NORMAL(reg) \
Expand Down Expand Up @@ -736,11 +736,11 @@ struct netxen_skb_frag {
(config_word) &= ~__tmask; \
(config_word) |= (((__tvalue) << (start)) & __tmask); \
}

#define _netxen_clear_bits(config_word, start, bits) {\
unsigned long long __tmask = (((1ULL << (bits)) - 1) << (start)); \
(config_word) &= ~__tmask; \
}
}

/* Following defines are for the state of the buffers */
#define NETXEN_BUFFER_FREE 0
Expand Down Expand Up @@ -879,7 +879,7 @@ struct netxen_dummy_dma {

struct netxen_adapter {
struct netxen_hardware_context ahw;

struct netxen_adapter *master;
struct net_device *netdev;
struct pci_dev *pdev;
Expand Down Expand Up @@ -916,7 +916,7 @@ struct netxen_adapter {
u32 temp;

struct netxen_adapter_stats stats;

u16 portno;
u16 link_speed;
u16 link_duplex;
Expand Down Expand Up @@ -1050,9 +1050,9 @@ int netxen_phantom_init(struct netxen_adapter *adapter, int pegtune_val);
int netxen_load_firmware(struct netxen_adapter *adapter);
int netxen_pinit_from_rom(struct netxen_adapter *adapter, int verbose);
int netxen_rom_fast_read(struct netxen_adapter *adapter, int addr, int *valp);
int netxen_rom_fast_read_words(struct netxen_adapter *adapter, int addr,
int netxen_rom_fast_read_words(struct netxen_adapter *adapter, int addr,
u8 *bytes, size_t size);
int netxen_rom_fast_write_words(struct netxen_adapter *adapter, int addr,
int netxen_rom_fast_write_words(struct netxen_adapter *adapter, int addr,
u8 *bytes, size_t size);
int netxen_flash_unlock(struct netxen_adapter *adapter);
int netxen_backup_crbinit(struct netxen_adapter *adapter);
Expand Down
26 changes: 13 additions & 13 deletions trunk/drivers/net/netxen/netxen_nic_ethtool.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -423,11 +423,11 @@ netxen_nic_get_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom,
if (eeprom->len == 0)
return -EINVAL;

eeprom->magic = (adapter->pdev)->vendor |
eeprom->magic = (adapter->pdev)->vendor |
((adapter->pdev)->device << 16);
offset = eeprom->offset;

ret = netxen_rom_fast_read_words(adapter, offset, bytes,
ret = netxen_rom_fast_read_words(adapter, offset, bytes,
eeprom->len);
if (ret < 0)
return ret;
Expand All @@ -453,16 +453,16 @@ netxen_nic_set_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom,
netxen_nic_driver_name);
return ret;
}
printk(KERN_INFO "%s: flash unlocked. \n",
printk(KERN_INFO "%s: flash unlocked. \n",
netxen_nic_driver_name);
last_schedule_time = jiffies;
ret = netxen_flash_erase_secondary(adapter);
if (ret != FLASH_SUCCESS) {
printk(KERN_ERR "%s: Flash erase failed.\n",
printk(KERN_ERR "%s: Flash erase failed.\n",
netxen_nic_driver_name);
return ret;
}
printk(KERN_INFO "%s: secondary flash erased successfully.\n",
printk(KERN_INFO "%s: secondary flash erased successfully.\n",
netxen_nic_driver_name);
flash_start = 1;
return 0;
Expand All @@ -471,7 +471,7 @@ netxen_nic_set_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom,
if (offset == NETXEN_BOOTLD_START) {
ret = netxen_flash_erase_primary(adapter);
if (ret != FLASH_SUCCESS) {
printk(KERN_ERR "%s: Flash erase failed.\n",
printk(KERN_ERR "%s: Flash erase failed.\n",
netxen_nic_driver_name);
return ret;
}
Expand All @@ -483,16 +483,16 @@ netxen_nic_set_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom,
if (ret != FLASH_SUCCESS)
return ret;

printk(KERN_INFO "%s: primary flash erased successfully\n",
printk(KERN_INFO "%s: primary flash erased successfully\n",
netxen_nic_driver_name);

ret = netxen_backup_crbinit(adapter);
if (ret != FLASH_SUCCESS) {
printk(KERN_ERR "%s: CRBinit backup failed.\n",
printk(KERN_ERR "%s: CRBinit backup failed.\n",
netxen_nic_driver_name);
return ret;
}
printk(KERN_INFO "%s: CRBinit backup done.\n",
printk(KERN_INFO "%s: CRBinit backup done.\n",
netxen_nic_driver_name);
ready_to_flash = 1;
}
Expand Down Expand Up @@ -570,7 +570,7 @@ netxen_nic_get_pauseparam(struct net_device *dev,
else
pause->tx_pause = !(netxen_xg_get_xg1_mask(val));
} else {
printk(KERN_ERR"%s: Unknown board type: %x\n",
printk(KERN_ERR"%s: Unknown board type: %x\n",
netxen_nic_driver_name, adapter->ahw.board_type);
}
}
Expand All @@ -589,7 +589,7 @@ netxen_nic_set_pauseparam(struct net_device *dev,
/* set flow control */
netxen_nic_read_w0(adapter,
NETXEN_NIU_GB_MAC_CONFIG_0(port), &val);

if (pause->rx_pause)
netxen_gb_rx_flowctl(val);
else
Expand Down Expand Up @@ -642,10 +642,10 @@ netxen_nic_set_pauseparam(struct net_device *dev,
else
netxen_xg_set_xg1_mask(val);
}
netxen_nic_write_w0(adapter, NETXEN_NIU_XG_PAUSE_CTL, val);
netxen_nic_write_w0(adapter, NETXEN_NIU_XG_PAUSE_CTL, val);
} else {
printk(KERN_ERR "%s: Unknown board type: %x\n",
netxen_nic_driver_name,
netxen_nic_driver_name,
adapter->ahw.board_type);
}
return 0;
Expand Down
12 changes: 6 additions & 6 deletions trunk/drivers/net/netxen/netxen_nic_hw.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ struct netxen_recv_crb recv_crb_registers[] = {
},
/* Jumbo frames */
{
/* crb_rcv_producer_offset: */
/* crb_rcv_producer_offset: */
NETXEN_NIC_REG(0x1f8),
/* crb_rcv_consumer_offset: */
NETXEN_NIC_REG(0x1fc),
Expand Down Expand Up @@ -209,7 +209,7 @@ struct netxen_recv_crb recv_crb_registers[] = {
},
/* Jumbo frames */
{
/* crb_rcv_producer_offset: */
/* crb_rcv_producer_offset: */
NETXEN_NIC_REG(0x23c),
/* crb_rcv_consumer_offset: */
NETXEN_NIC_REG(0x240),
Expand Down Expand Up @@ -888,7 +888,7 @@ void netxen_nic_read_w0(struct netxen_adapter *adapter, u32 index, u32 * value)
netxen_nic_pci_change_crbwindow(adapter, 1);
}

static int netxen_pci_set_window_warning_count = 0;
static int netxen_pci_set_window_warning_count;

static unsigned long netxen_nic_pci_set_window(struct netxen_adapter *adapter,
unsigned long long addr)
Expand Down Expand Up @@ -958,7 +958,7 @@ int
netxen_nic_erase_pxe(struct netxen_adapter *adapter)
{
if (netxen_rom_fast_write(adapter, NETXEN_PXE_START, 0) == -1) {
printk(KERN_ERR "%s: erase pxe failed\n",
printk(KERN_ERR "%s: erase pxe failed\n",
netxen_nic_driver_name);
return -1;
}
Expand Down Expand Up @@ -1039,9 +1039,9 @@ int netxen_nic_set_mtu_xgb(struct netxen_adapter *adapter, int new_mtu)
{
new_mtu += NETXEN_NIU_HDRSIZE + NETXEN_NIU_TLRSIZE;
if (physical_port[adapter->portnum] == 0)
netxen_nic_write_w0(adapter, NETXEN_NIU_XGE_MAX_FRAME_SIZE,
netxen_nic_write_w0(adapter, NETXEN_NIU_XGE_MAX_FRAME_SIZE,
new_mtu);
else
else
netxen_nic_write_w0(adapter, NETXEN_NIU_XG1_MAX_FRAME_SIZE,
new_mtu);
return 0;
Expand Down
10 changes: 5 additions & 5 deletions trunk/drivers/net/netxen/netxen_nic_hw.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ typedef enum {
((config_word) |= 1 << 0)
#define netxen_xg_set_xg1_mask(config_word) \
((config_word) |= 1 << 3)

#define netxen_xg_get_xg0_mask(config_word) \
_netxen_crb_get_bit((config_word), 0)
#define netxen_xg_get_xg1_mask(config_word) \
Expand Down Expand Up @@ -273,7 +273,7 @@ typedef enum {
_netxen_crb_get_bit((config_word), 4)
#define netxen_gb_get_gb3_mask(config_word) \
_netxen_crb_get_bit((config_word), 6)

#define netxen_gb_unset_gb0_mask(config_word) \
((config_word) &= ~(1 << 0))
#define netxen_gb_unset_gb1_mask(config_word) \
Expand Down Expand Up @@ -437,7 +437,7 @@ typedef enum {

/*
* NIU GB Drop CRC Register
*
*
* Bit 0 : drop_gb0 => 1:drop pkts with bad CRCs, 0:pass them on
* Bit 1 : drop_gb1 => 1:drop pkts with bad CRCs, 0:pass them on
* Bit 2 : drop_gb2 => 1:drop pkts with bad CRCs, 0:pass them on
Expand Down Expand Up @@ -480,7 +480,7 @@ typedef enum {

/*
* MAC Control Register
*
*
* Bit 0-1 : id_pool0
* Bit 2 : enable_xtnd0
* Bit 4-5 : id_pool1
Expand Down Expand Up @@ -515,7 +515,7 @@ typedef enum {
((config) |= (((val) & 0x0f) << 28))

/* Set promiscuous mode for a GbE interface */
int netxen_niu_set_promiscuous_mode(struct netxen_adapter *adapter,
int netxen_niu_set_promiscuous_mode(struct netxen_adapter *adapter,
netxen_niu_prom_mode_t mode);
int netxen_niu_xg_set_promiscuous_mode(struct netxen_adapter *adapter,
netxen_niu_prom_mode_t mode);
Expand Down
24 changes: 12 additions & 12 deletions trunk/drivers/net/netxen/netxen_nic_init.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,7 @@ static int do_rom_fast_read_words(struct netxen_adapter *adapter, int addr,
}

int
netxen_rom_fast_read_words(struct netxen_adapter *adapter, int addr,
netxen_rom_fast_read_words(struct netxen_adapter *adapter, int addr,
u8 *bytes, size_t size)
{
int ret;
Expand Down Expand Up @@ -490,7 +490,7 @@ int netxen_rom_fast_write(struct netxen_adapter *adapter, int addr, int data)
}
#endif /* 0 */

static int do_rom_fast_write_words(struct netxen_adapter *adapter,
static int do_rom_fast_write_words(struct netxen_adapter *adapter,
int addr, u8 *bytes, size_t size)
{
int addridx = addr;
Expand All @@ -505,7 +505,7 @@ static int do_rom_fast_write_words(struct netxen_adapter *adapter,
ret = do_rom_fast_write(adapter, addridx, data);
if (ret < 0)
return ret;

while(1) {
int data1;

Expand All @@ -518,7 +518,7 @@ static int do_rom_fast_write_words(struct netxen_adapter *adapter,

if (timeout++ >= rom_write_timeout) {
if (last_attempt++ < 4) {
ret = do_rom_fast_write(adapter,
ret = do_rom_fast_write(adapter,
addridx, data);
if (ret < 0)
return ret;
Expand All @@ -538,7 +538,7 @@ static int do_rom_fast_write_words(struct netxen_adapter *adapter,
return ret;
}

int netxen_rom_fast_write_words(struct netxen_adapter *adapter, int addr,
int netxen_rom_fast_write_words(struct netxen_adapter *adapter, int addr,
u8 *bytes, size_t size)
{
int ret = 0;
Expand All @@ -562,7 +562,7 @@ static int netxen_rom_wrsr(struct netxen_adapter *adapter, int data)
return ret;

netxen_crb_writelit_adapter(adapter, NETXEN_ROMUSB_ROM_WDATA, data);
netxen_crb_writelit_adapter(adapter,
netxen_crb_writelit_adapter(adapter,
NETXEN_ROMUSB_ROM_INSTR_OPCODE, 0x1);

ret = netxen_wait_rom_done(adapter);
Expand Down Expand Up @@ -592,7 +592,7 @@ int netxen_backup_crbinit(struct netxen_adapter *adapter)
char *buffer = kmalloc(NETXEN_FLASH_SECTOR_SIZE, GFP_KERNEL);

if (!buffer)
return -ENOMEM;
return -ENOMEM;
/* unlock sector 63 */
val = netxen_rom_rdsr(adapter);
val = val & 0xe3;
Expand All @@ -605,12 +605,12 @@ int netxen_backup_crbinit(struct netxen_adapter *adapter)
goto out_kfree;

/* copy sector 0 to sector 63 */
ret = netxen_rom_fast_read_words(adapter, NETXEN_CRBINIT_START,
ret = netxen_rom_fast_read_words(adapter, NETXEN_CRBINIT_START,
buffer, NETXEN_FLASH_SECTOR_SIZE);
if (ret != FLASH_SUCCESS)
goto out_kfree;

ret = netxen_rom_fast_write_words(adapter, NETXEN_FIXED_START,
ret = netxen_rom_fast_write_words(adapter, NETXEN_FIXED_START,
buffer, NETXEN_FLASH_SECTOR_SIZE);
if (ret != FLASH_SUCCESS)
goto out_kfree;
Expand Down Expand Up @@ -658,9 +658,9 @@ static void check_erased_flash(struct netxen_adapter *adapter, int addr)
int count = 0, erased_errors = 0;
int range;

range = (addr == NETXEN_USER_START) ?
range = (addr == NETXEN_USER_START) ?
NETXEN_FIXED_START : addr + NETXEN_FLASH_SECTOR_SIZE;

for (i = addr; i < range; i += 4) {
netxen_rom_fast_read(adapter, i, &val);
if (val != 0xffffffff)
Expand Down Expand Up @@ -1495,7 +1495,7 @@ static void netxen_post_rx_buffers_nodb(struct netxen_adapter *adapter,
count++; /* now there should be no failure */
pdesc = &rcv_desc->desc_head[producer];
skb_reserve(skb, 2);
/*
/*
* This will be setup when we receive the
* buffer after it has been filled
* skb->dev = netdev;
Expand Down
8 changes: 4 additions & 4 deletions trunk/drivers/net/netxen/netxen_nic_isr.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ struct net_device_stats *netxen_nic_get_stats(struct net_device *netdev)
/* total packets received */
stats->rx_packets = adapter->stats.no_rcv;
/* total packets transmitted */
stats->tx_packets = adapter->stats.xmitedframes +
stats->tx_packets = adapter->stats.xmitedframes +
adapter->stats.xmitfinished;
/* total bytes received */
stats->rx_bytes = adapter->stats.rxbytes;
Expand Down Expand Up @@ -84,7 +84,7 @@ void netxen_handle_port_int(struct netxen_adapter *adapter, u32 enable)

/* This should clear the interrupt source */
if (adapter->phy_read)
adapter->phy_read(adapter,
adapter->phy_read(adapter,
NETXEN_NIU_GB_MII_MGMT_ADDR_INT_STATUS,
&int_src);
if (int_src == 0) {
Expand Down Expand Up @@ -113,7 +113,7 @@ void netxen_handle_port_int(struct netxen_adapter *adapter, u32 enable)
DPRINTK(INFO, "SPEED CHANGED OR LINK STATUS CHANGED \n");

if (adapter->phy_read
&& adapter->phy_read(adapter,
&& adapter->phy_read(adapter,
NETXEN_NIU_GB_MII_MGMT_ADDR_PHY_STATUS,
&status) == 0) {
if (netxen_get_phy_int_link_status_changed(int_src)) {
Expand All @@ -127,7 +127,7 @@ void netxen_handle_port_int(struct netxen_adapter *adapter, u32 enable)
netxen_nic_driver_name,
adapter->netdev->name);
}
netxen_indicate_link_status(adapter,
netxen_indicate_link_status(adapter,
netxen_get_phy_link
(status));
}
Expand Down
Loading

0 comments on commit 06e9787

Please sign in to comment.