Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 35332
b: refs/heads/master
c: 7282d49
h: refs/heads/master
v: v3
  • Loading branch information
Jeff Garzik committed Sep 13, 2006
1 parent a7386e2 commit 92221e1
Show file tree
Hide file tree
Showing 107 changed files with 164 additions and 179 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: 76fd85937097a0c2ec8ab23bf21dc10992d1c398
refs/heads/master: 7282d491ecaee9883233a0e27283c4c79486279a
2 changes: 1 addition & 1 deletion trunk/drivers/net/3c501.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -881,7 +881,7 @@ static void netdev_set_msglevel(struct net_device *dev, u32 level)
debug = level;
}

static struct ethtool_ops netdev_ethtool_ops = {
static const struct ethtool_ops netdev_ethtool_ops = {
.get_drvinfo = netdev_get_drvinfo,
.get_msglevel = netdev_get_msglevel,
.set_msglevel = netdev_set_msglevel,
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/net/3c501.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ static void el_reset(struct net_device *dev);
static int el1_close(struct net_device *dev);
static struct net_device_stats *el1_get_stats(struct net_device *dev);
static void set_multicast_list(struct net_device *dev);
static struct ethtool_ops netdev_ethtool_ops;
static const struct ethtool_ops netdev_ethtool_ops;

#define EL1_IO_EXTENT 16

Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/net/3c503.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ static void el2_block_input(struct net_device *dev, int count, struct sk_buff *s
int ring_offset);
static void el2_get_8390_hdr(struct net_device *dev, struct e8390_pkt_hdr *hdr,
int ring_page);
static struct ethtool_ops netdev_ethtool_ops;
static const struct ethtool_ops netdev_ethtool_ops;


/* This routine probes for a memory-mapped 3c503 board by looking for
Expand Down Expand Up @@ -666,7 +666,7 @@ static void netdev_get_drvinfo(struct net_device *dev,
sprintf(info->bus_info, "ISA 0x%lx", dev->base_addr);
}

static struct ethtool_ops netdev_ethtool_ops = {
static const struct ethtool_ops netdev_ethtool_ops = {
.get_drvinfo = netdev_get_drvinfo,
};

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/net/3c505.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1169,7 +1169,7 @@ static void netdev_set_msglevel(struct net_device *dev, u32 level)
debug = level;
}

static struct ethtool_ops netdev_ethtool_ops = {
static const struct ethtool_ops netdev_ethtool_ops = {
.get_drvinfo = netdev_get_drvinfo,
.get_msglevel = netdev_get_msglevel,
.set_msglevel = netdev_set_msglevel,
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/net/3c507.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ static void el16_tx_timeout (struct net_device *dev);

static void hardware_send_packet(struct net_device *dev, void *buf, short length, short pad);
static void init_82586_mem(struct net_device *dev);
static struct ethtool_ops netdev_ethtool_ops;
static const struct ethtool_ops netdev_ethtool_ops;
static void init_rx_bufs(struct net_device *);

static int io = 0x300;
Expand Down Expand Up @@ -919,7 +919,7 @@ static void netdev_set_msglevel(struct net_device *dev, u32 level)
debug = level;
}

static struct ethtool_ops netdev_ethtool_ops = {
static const struct ethtool_ops netdev_ethtool_ops = {
.get_drvinfo = netdev_get_drvinfo,
.get_msglevel = netdev_get_msglevel,
.set_msglevel = netdev_set_msglevel,
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/net/3c509.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ static void set_multicast_list(struct net_device *dev);
static void el3_tx_timeout (struct net_device *dev);
static void el3_down(struct net_device *dev);
static void el3_up(struct net_device *dev);
static struct ethtool_ops ethtool_ops;
static const struct ethtool_ops ethtool_ops;
#ifdef EL3_SUSPEND
static int el3_suspend(struct device *, pm_message_t);
static int el3_resume(struct device *);
Expand Down Expand Up @@ -1349,7 +1349,7 @@ static void el3_set_msglevel(struct net_device *dev, u32 v)
el3_debug = v;
}

static struct ethtool_ops ethtool_ops = {
static const struct ethtool_ops ethtool_ops = {
.get_drvinfo = el3_get_drvinfo,
.get_settings = el3_get_settings,
.set_settings = el3_set_settings,
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/net/3c515.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ static int corkscrew_close(struct net_device *dev);
static void update_stats(int addr, struct net_device *dev);
static struct net_device_stats *corkscrew_get_stats(struct net_device *dev);
static void set_rx_mode(struct net_device *dev);
static struct ethtool_ops netdev_ethtool_ops;
static const struct ethtool_ops netdev_ethtool_ops;


/*
Expand Down Expand Up @@ -1561,7 +1561,7 @@ static void netdev_set_msglevel(struct net_device *dev, u32 level)
corkscrew_debug = level;
}

static struct ethtool_ops netdev_ethtool_ops = {
static const struct ethtool_ops netdev_ethtool_ops = {
.get_drvinfo = netdev_get_drvinfo,
.get_msglevel = netdev_get_msglevel,
.set_msglevel = netdev_set_msglevel,
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/net/3c523.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ static void elmc_timeout(struct net_device *dev);
#ifdef ELMC_MULTICAST
static void set_multicast_list(struct net_device *dev);
#endif
static struct ethtool_ops netdev_ethtool_ops;
static const struct ethtool_ops netdev_ethtool_ops;

/* helper-functions */
static int init586(struct net_device *dev);
Expand Down Expand Up @@ -1259,7 +1259,7 @@ static void netdev_get_drvinfo(struct net_device *dev,
sprintf(info->bus_info, "MCA 0x%lx", dev->base_addr);
}

static struct ethtool_ops netdev_ethtool_ops = {
static const struct ethtool_ops netdev_ethtool_ops = {
.get_drvinfo = netdev_get_drvinfo,
};

Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/net/3c527.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ static int mc32_close(struct net_device *dev);
static struct net_device_stats *mc32_get_stats(struct net_device *dev);
static void mc32_set_multicast_list(struct net_device *dev);
static void mc32_reset_multicast_list(struct net_device *dev);
static struct ethtool_ops netdev_ethtool_ops;
static const struct ethtool_ops netdev_ethtool_ops;

static void cleanup_card(struct net_device *dev)
{
Expand Down Expand Up @@ -1627,7 +1627,7 @@ static void netdev_set_msglevel(struct net_device *dev, u32 level)
mc32_debug = level;
}

static struct ethtool_ops netdev_ethtool_ops = {
static const struct ethtool_ops netdev_ethtool_ops = {
.get_drvinfo = netdev_get_drvinfo,
.get_msglevel = netdev_get_msglevel,
.set_msglevel = netdev_set_msglevel,
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/net/3c59x.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -729,7 +729,7 @@ static int vortex_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
#endif
static void vortex_tx_timeout(struct net_device *dev);
static void acpi_set_WOL(struct net_device *dev);
static struct ethtool_ops vortex_ethtool_ops;
static const struct ethtool_ops vortex_ethtool_ops;
static void set_8021q_mode(struct net_device *dev, int enable);

/* This driver uses 'options' to pass the media type, full-duplex flag, etc. */
Expand Down Expand Up @@ -2873,7 +2873,7 @@ static void vortex_get_drvinfo(struct net_device *dev,
}
}

static struct ethtool_ops vortex_ethtool_ops = {
static const struct ethtool_ops vortex_ethtool_ops = {
.get_drvinfo = vortex_get_drvinfo,
.get_strings = vortex_get_strings,
.get_msglevel = vortex_get_msglevel,
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/net/8139cp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1546,7 +1546,7 @@ static void cp_get_ethtool_stats (struct net_device *dev,
pci_free_consistent(cp->pdev, sizeof(*nic_stats), nic_stats, dma);
}

static struct ethtool_ops cp_ethtool_ops = {
static const struct ethtool_ops cp_ethtool_ops = {
.get_drvinfo = cp_get_drvinfo,
.get_regs_len = cp_get_regs_len,
.get_stats_count = cp_get_stats_count,
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/net/8139too.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -639,7 +639,7 @@ static void __set_rx_mode (struct net_device *dev);
static void rtl8139_hw_start (struct net_device *dev);
static void rtl8139_thread (void *_data);
static void rtl8139_tx_timeout_task(void *_data);
static struct ethtool_ops rtl8139_ethtool_ops;
static const struct ethtool_ops rtl8139_ethtool_ops;

/* write MMIO register, with flush */
/* Flush avoids rtl8139 bug w/ posted MMIO writes */
Expand Down Expand Up @@ -2446,7 +2446,7 @@ static void rtl8139_get_strings(struct net_device *dev, u32 stringset, u8 *data)
memcpy(data, ethtool_stats_keys, sizeof(ethtool_stats_keys));
}

static struct ethtool_ops rtl8139_ethtool_ops = {
static const struct ethtool_ops rtl8139_ethtool_ops = {
.get_drvinfo = rtl8139_get_drvinfo,
.get_settings = rtl8139_get_settings,
.set_settings = rtl8139_set_settings,
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/net/acenic.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -451,7 +451,7 @@ static int ace_get_settings(struct net_device *, struct ethtool_cmd *);
static int ace_set_settings(struct net_device *, struct ethtool_cmd *);
static void ace_get_drvinfo(struct net_device *, struct ethtool_drvinfo *);

static struct ethtool_ops ace_ethtool_ops = {
static const struct ethtool_ops ace_ethtool_ops = {
.get_settings = ace_get_settings,
.set_settings = ace_set_settings,
.get_drvinfo = ace_get_drvinfo,
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/net/amd8111e.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1645,7 +1645,7 @@ static int amd8111e_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol_
return 0;
}

static struct ethtool_ops ops = {
static const struct ethtool_ops ops = {
.get_drvinfo = amd8111e_get_drvinfo,
.get_regs_len = amd8111e_get_regs_len,
.get_regs = amd8111e_get_regs,
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/net/arm/at91_ether.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -648,7 +648,7 @@ static void at91ether_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo
strlcpy(info->bus_info, dev->class_dev.dev->bus_id, sizeof(info->bus_info));
}

static struct ethtool_ops at91ether_ethtool_ops = {
static const struct ethtool_ops at91ether_ethtool_ops = {
.get_settings = at91ether_get_settings,
.set_settings = at91ether_set_settings,
.get_drvinfo = at91ether_get_drvinfo,
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/net/arm/etherh.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -626,7 +626,7 @@ static int etherh_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
return 0;
}

static struct ethtool_ops etherh_ethtool_ops = {
static const struct ethtool_ops etherh_ethtool_ops = {
.get_settings = etherh_get_settings,
.set_settings = etherh_set_settings,
.get_drvinfo = etherh_get_drvinfo,
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/net/au1000_eth.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -608,7 +608,7 @@ au1000_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
info->regdump_len = 0;
}

static struct ethtool_ops au1000_ethtool_ops = {
static const struct ethtool_ops au1000_ethtool_ops = {
.get_settings = au1000_get_settings,
.set_settings = au1000_set_settings,
.get_drvinfo = au1000_get_drvinfo,
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/net/b44.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2012,7 +2012,7 @@ static int b44_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
return 0;
}

static struct ethtool_ops b44_ethtool_ops = {
static const struct ethtool_ops b44_ethtool_ops = {
.get_drvinfo = b44_get_drvinfo,
.get_settings = b44_get_settings,
.set_settings = b44_set_settings,
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/net/bnx2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5429,7 +5429,7 @@ bnx2_phys_id(struct net_device *dev, u32 data)
return 0;
}

static struct ethtool_ops bnx2_ethtool_ops = {
static const struct ethtool_ops bnx2_ethtool_ops = {
.get_settings = bnx2_get_settings,
.set_settings = bnx2_set_settings,
.get_drvinfo = bnx2_get_drvinfo,
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/net/bonding/bond_main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4130,7 +4130,7 @@ static void bond_ethtool_get_drvinfo(struct net_device *bond_dev,
snprintf(drvinfo->fw_version, 32, "%d", BOND_ABI_VERSION);
}

static struct ethtool_ops bond_ethtool_ops = {
static const struct ethtool_ops bond_ethtool_ops = {
.get_tx_csum = ethtool_op_get_tx_csum,
.get_tso = ethtool_op_get_tso,
.get_ufo = ethtool_op_get_ufo,
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/net/cassini.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4812,7 +4812,7 @@ static void cas_get_ethtool_stats(struct net_device *dev,
BUG_ON(i != CAS_NUM_STAT_KEYS);
}

static struct ethtool_ops cas_ethtool_ops = {
static const struct ethtool_ops cas_ethtool_ops = {
.get_drvinfo = cas_get_drvinfo,
.get_settings = cas_get_settings,
.set_settings = cas_set_settings,
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/net/chelsio/cxgb2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -779,7 +779,7 @@ static int get_eeprom(struct net_device *dev, struct ethtool_eeprom *e,
return 0;
}

static struct ethtool_ops t1_ethtool_ops = {
static const struct ethtool_ops t1_ethtool_ops = {
.get_settings = get_settings,
.set_settings = set_settings,
.get_drvinfo = get_drvinfo,
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/net/cris/eth_v10.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,7 @@ static void e100_reset_transceiver(struct net_device* net);
static void e100_clear_network_leds(unsigned long dummy);
static void e100_set_network_leds(int active);

static struct ethtool_ops e100_ethtool_ops;
static const struct ethtool_ops e100_ethtool_ops;

static void broadcom_check_speed(struct net_device* dev);
static void broadcom_check_duplex(struct net_device* dev);
Expand Down Expand Up @@ -1552,7 +1552,7 @@ static int e100_nway_reset(struct net_device *dev)
return 0;
}

static struct ethtool_ops e100_ethtool_ops = {
static const struct ethtool_ops e100_ethtool_ops = {
.get_settings = e100_get_settings,
.set_settings = e100_set_settings,
.get_drvinfo = e100_get_drvinfo,
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/net/dl2k.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ static int mii_read (struct net_device *dev, int phy_addr, int reg_num);
static int mii_write (struct net_device *dev, int phy_addr, int reg_num,
u16 data);

static struct ethtool_ops ethtool_ops;
static const struct ethtool_ops ethtool_ops;

static int __devinit
rio_probe1 (struct pci_dev *pdev, const struct pci_device_id *ent)
Expand Down Expand Up @@ -1261,7 +1261,7 @@ static u32 rio_get_link(struct net_device *dev)
return np->link_status;
}

static struct ethtool_ops ethtool_ops = {
static const struct ethtool_ops ethtool_ops = {
.get_drvinfo = rio_get_drvinfo,
.get_settings = rio_get_settings,
.set_settings = rio_set_settings,
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/net/e100.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2477,7 +2477,7 @@ static void e100_get_strings(struct net_device *netdev, u32 stringset, u8 *data)
}
}

static struct ethtool_ops e100_ethtool_ops = {
static const struct ethtool_ops e100_ethtool_ops = {
.get_settings = e100_get_settings,
.set_settings = e100_set_settings,
.get_drvinfo = e100_get_drvinfo,
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/net/e1000/e1000_ethtool.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1922,7 +1922,7 @@ e1000_get_strings(struct net_device *netdev, uint32_t stringset, uint8_t *data)
}
}

static struct ethtool_ops e1000_ethtool_ops = {
static const struct ethtool_ops e1000_ethtool_ops = {
.get_settings = e1000_get_settings,
.set_settings = e1000_set_settings,
.get_drvinfo = e1000_get_drvinfo,
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/net/eepro.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -743,7 +743,7 @@ static void __init eepro_print_info (struct net_device *dev)
printEEPROMInfo(dev);
}

static struct ethtool_ops eepro_ethtool_ops;
static const struct ethtool_ops eepro_ethtool_ops;

/* This is the real probe routine. Linux has a history of friendly device
probes on the ISA bus. A good device probe avoids doing writes, and
Expand Down Expand Up @@ -1771,7 +1771,7 @@ static void eepro_ethtool_get_drvinfo(struct net_device *dev,
sprintf(drvinfo->bus_info, "ISA 0x%lx", dev->base_addr);
}

static struct ethtool_ops eepro_ethtool_ops = {
static const struct ethtool_ops eepro_ethtool_ops = {
.get_settings = eepro_ethtool_get_settings,
.get_drvinfo = eepro_ethtool_get_drvinfo,
};
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/net/eepro100.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,7 @@ static struct net_device_stats *speedo_get_stats(struct net_device *dev);
static int speedo_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
static void set_rx_mode(struct net_device *dev);
static void speedo_show_state(struct net_device *dev);
static struct ethtool_ops ethtool_ops;
static const struct ethtool_ops ethtool_ops;



Expand Down Expand Up @@ -2015,7 +2015,7 @@ static void speedo_set_msglevel(struct net_device *dev, u32 v)
sp->msg_enable = v;
}

static struct ethtool_ops ethtool_ops = {
static const struct ethtool_ops ethtool_ops = {
.get_drvinfo = speedo_get_drvinfo,
.get_settings = speedo_get_settings,
.set_settings = speedo_set_settings,
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/net/ehea/ehea_ethtool.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ static void ehea_get_ethtool_stats(struct net_device *dev,
kfree(cb6);
}

struct ethtool_ops ehea_ethtool_ops = {
const struct ethtool_ops ehea_ethtool_ops = {
.get_settings = ehea_get_settings,
.get_drvinfo = ehea_get_drvinfo,
.get_msglevel = ehea_get_msglevel,
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/net/epic100.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ static int epic_rx(struct net_device *dev, int budget);
static int epic_poll(struct net_device *dev, int *budget);
static irqreturn_t epic_interrupt(int irq, void *dev_instance, struct pt_regs *regs);
static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
static struct ethtool_ops netdev_ethtool_ops;
static const struct ethtool_ops netdev_ethtool_ops;
static int epic_close(struct net_device *dev);
static struct net_device_stats *epic_get_stats(struct net_device *dev);
static void set_rx_mode(struct net_device *dev);
Expand Down Expand Up @@ -1492,7 +1492,7 @@ static void ethtool_complete(struct net_device *dev)
}
}

static struct ethtool_ops netdev_ethtool_ops = {
static const struct ethtool_ops netdev_ethtool_ops = {
.get_drvinfo = netdev_get_drvinfo,
.get_settings = netdev_get_settings,
.set_settings = netdev_set_settings,
Expand Down
Loading

0 comments on commit 92221e1

Please sign in to comment.