diff options
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/3c527.c | 4 | ||||
-rw-r--r-- | drivers/net/appletalk/ipddp.c | 2 | ||||
-rw-r--r-- | drivers/net/benet/be_hw.h | 2 | ||||
-rw-r--r-- | drivers/net/gianfar.c | 2 | ||||
-rw-r--r-- | drivers/net/hp100.c | 2 | ||||
-rw-r--r-- | drivers/net/ibm_newemac/core.c | 2 | ||||
-rw-r--r-- | drivers/net/ksz884x.c | 2 | ||||
-rw-r--r-- | drivers/net/ll_temac_main.c | 2 | ||||
-rw-r--r-- | drivers/net/sh_eth.c | 2 | ||||
-rw-r--r-- | drivers/net/tulip/dmfe.c | 20 | ||||
-rw-r--r-- | drivers/net/wimax/i2400m/control.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/hostap/hostap_ap.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/hostap/hostap_hw.c | 2 |
13 files changed, 23 insertions, 23 deletions
diff --git a/drivers/net/3c527.c b/drivers/net/3c527.c index 38395dfa4963..70705d1306b9 100644 --- a/drivers/net/3c527.c +++ b/drivers/net/3c527.c | |||
@@ -729,14 +729,14 @@ static void mc32_halt_transceiver(struct net_device *dev) | |||
729 | * mc32_load_rx_ring - load the ring of receive buffers | 729 | * mc32_load_rx_ring - load the ring of receive buffers |
730 | * @dev: 3c527 to build the ring for | 730 | * @dev: 3c527 to build the ring for |
731 | * | 731 | * |
732 | * This initalises the on-card and driver datastructures to | 732 | * This initialises the on-card and driver datastructures to |
733 | * the point where mc32_start_transceiver() can be called. | 733 | * the point where mc32_start_transceiver() can be called. |
734 | * | 734 | * |
735 | * The card sets up the receive ring for us. We are required to use the | 735 | * The card sets up the receive ring for us. We are required to use the |
736 | * ring it provides, although the size of the ring is configurable. | 736 | * ring it provides, although the size of the ring is configurable. |
737 | * | 737 | * |
738 | * We allocate an sk_buff for each ring entry in turn and | 738 | * We allocate an sk_buff for each ring entry in turn and |
739 | * initalise its house-keeping info. At the same time, we read | 739 | * initialise its house-keeping info. At the same time, we read |
740 | * each 'next' pointer in our rx_ring array. This reduces slow | 740 | * each 'next' pointer in our rx_ring array. This reduces slow |
741 | * shared-memory reads and makes it easy to access predecessor | 741 | * shared-memory reads and makes it easy to access predecessor |
742 | * descriptors. | 742 | * descriptors. |
diff --git a/drivers/net/appletalk/ipddp.c b/drivers/net/appletalk/ipddp.c index 79636ee35829..0362c8d31a08 100644 --- a/drivers/net/appletalk/ipddp.c +++ b/drivers/net/appletalk/ipddp.c | |||
@@ -80,7 +80,7 @@ static struct net_device * __init ipddp_init(void) | |||
80 | if (version_printed++ == 0) | 80 | if (version_printed++ == 0) |
81 | printk(version); | 81 | printk(version); |
82 | 82 | ||
83 | /* Initalize the device structure. */ | 83 | /* Initialize the device structure. */ |
84 | dev->netdev_ops = &ipddp_netdev_ops; | 84 | dev->netdev_ops = &ipddp_netdev_ops; |
85 | 85 | ||
86 | dev->type = ARPHRD_IPDDP; /* IP over DDP tunnel */ | 86 | dev->type = ARPHRD_IPDDP; /* IP over DDP tunnel */ |
diff --git a/drivers/net/benet/be_hw.h b/drivers/net/benet/be_hw.h index 6c8f9bb8bfe6..5d38046402b2 100644 --- a/drivers/net/benet/be_hw.h +++ b/drivers/net/benet/be_hw.h | |||
@@ -52,7 +52,7 @@ | |||
52 | */ | 52 | */ |
53 | #define MEMBAR_CTRL_INT_CTRL_HOSTINTR_MASK (1 << 29) /* bit 29 */ | 53 | #define MEMBAR_CTRL_INT_CTRL_HOSTINTR_MASK (1 << 29) /* bit 29 */ |
54 | 54 | ||
55 | /********* Power managment (WOL) **********/ | 55 | /********* Power management (WOL) **********/ |
56 | #define PCICFG_PM_CONTROL_OFFSET 0x44 | 56 | #define PCICFG_PM_CONTROL_OFFSET 0x44 |
57 | #define PCICFG_PM_CONTROL_MASK 0x108 /* bits 3 & 8 */ | 57 | #define PCICFG_PM_CONTROL_MASK 0x108 /* bits 3 & 8 */ |
58 | 58 | ||
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c index 27f02970d898..a1b6301bc674 100644 --- a/drivers/net/gianfar.c +++ b/drivers/net/gianfar.c | |||
@@ -917,7 +917,7 @@ static void gfar_init_filer_table(struct gfar_private *priv) | |||
917 | rqfar = cluster_entry_per_class(priv, rqfar, RQFPR_IPV4 | RQFPR_UDP); | 917 | rqfar = cluster_entry_per_class(priv, rqfar, RQFPR_IPV4 | RQFPR_UDP); |
918 | rqfar = cluster_entry_per_class(priv, rqfar, RQFPR_IPV4 | RQFPR_TCP); | 918 | rqfar = cluster_entry_per_class(priv, rqfar, RQFPR_IPV4 | RQFPR_TCP); |
919 | 919 | ||
920 | /* cur_filer_idx indicated the fisrt non-masked rule */ | 920 | /* cur_filer_idx indicated the first non-masked rule */ |
921 | priv->cur_filer_idx = rqfar; | 921 | priv->cur_filer_idx = rqfar; |
922 | 922 | ||
923 | /* Rest are masked rules */ | 923 | /* Rest are masked rules */ |
diff --git a/drivers/net/hp100.c b/drivers/net/hp100.c index ce587f4c4203..095b17ecf609 100644 --- a/drivers/net/hp100.c +++ b/drivers/net/hp100.c | |||
@@ -1072,7 +1072,7 @@ static void hp100_mmuinit(struct net_device *dev) | |||
1072 | if (lp->mode == 1) | 1072 | if (lp->mode == 1) |
1073 | hp100_init_pdls(dev); | 1073 | hp100_init_pdls(dev); |
1074 | 1074 | ||
1075 | /* Go to performance page and initalize isr and imr registers */ | 1075 | /* Go to performance page and initialize isr and imr registers */ |
1076 | hp100_page(PERFORMANCE); | 1076 | hp100_page(PERFORMANCE); |
1077 | hp100_outw(0xfefe, IRQ_MASK); /* mask off all ints */ | 1077 | hp100_outw(0xfefe, IRQ_MASK); /* mask off all ints */ |
1078 | hp100_outw(0xffff, IRQ_STATUS); /* ack IRQ */ | 1078 | hp100_outw(0xffff, IRQ_STATUS); /* ack IRQ */ |
diff --git a/drivers/net/ibm_newemac/core.c b/drivers/net/ibm_newemac/core.c index b150c102ca5a..0f1d4e96cf89 100644 --- a/drivers/net/ibm_newemac/core.c +++ b/drivers/net/ibm_newemac/core.c | |||
@@ -1045,7 +1045,7 @@ static int emac_change_mtu(struct net_device *ndev, int new_mtu) | |||
1045 | DBG(dev, "change_mtu(%d)" NL, new_mtu); | 1045 | DBG(dev, "change_mtu(%d)" NL, new_mtu); |
1046 | 1046 | ||
1047 | if (netif_running(ndev)) { | 1047 | if (netif_running(ndev)) { |
1048 | /* Check if we really need to reinitalize RX ring */ | 1048 | /* Check if we really need to reinitialize RX ring */ |
1049 | if (emac_rx_skb_size(ndev->mtu) != emac_rx_skb_size(new_mtu)) | 1049 | if (emac_rx_skb_size(ndev->mtu) != emac_rx_skb_size(new_mtu)) |
1050 | ret = emac_resize_rx_ring(dev, new_mtu); | 1050 | ret = emac_resize_rx_ring(dev, new_mtu); |
1051 | } | 1051 | } |
diff --git a/drivers/net/ksz884x.c b/drivers/net/ksz884x.c index 8b32cc107f0f..37504a398906 100644 --- a/drivers/net/ksz884x.c +++ b/drivers/net/ksz884x.c | |||
@@ -6810,7 +6810,7 @@ static int stp; | |||
6810 | static int fast_aging; | 6810 | static int fast_aging; |
6811 | 6811 | ||
6812 | /** | 6812 | /** |
6813 | * netdev_init - initalize network device. | 6813 | * netdev_init - initialize network device. |
6814 | * @dev: Network device. | 6814 | * @dev: Network device. |
6815 | * | 6815 | * |
6816 | * This function initializes the network device. | 6816 | * This function initializes the network device. |
diff --git a/drivers/net/ll_temac_main.c b/drivers/net/ll_temac_main.c index b5c6279cc5a3..4eea3f70c5cf 100644 --- a/drivers/net/ll_temac_main.c +++ b/drivers/net/ll_temac_main.c | |||
@@ -497,7 +497,7 @@ static u32 temac_setoptions(struct net_device *ndev, u32 options) | |||
497 | return (0); | 497 | return (0); |
498 | } | 498 | } |
499 | 499 | ||
500 | /* Initilize temac */ | 500 | /* Initialize temac */ |
501 | static void temac_device_reset(struct net_device *ndev) | 501 | static void temac_device_reset(struct net_device *ndev) |
502 | { | 502 | { |
503 | struct temac_local *lp = netdev_priv(ndev); | 503 | struct temac_local *lp = netdev_priv(ndev); |
diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c index 32f2deaa38bb..f5a9eb1df593 100644 --- a/drivers/net/sh_eth.c +++ b/drivers/net/sh_eth.c | |||
@@ -1376,7 +1376,7 @@ static int sh_mdio_init(struct net_device *ndev, int id) | |||
1376 | bitbang->mdc_msk = 0x01; | 1376 | bitbang->mdc_msk = 0x01; |
1377 | bitbang->ctrl.ops = &bb_ops; | 1377 | bitbang->ctrl.ops = &bb_ops; |
1378 | 1378 | ||
1379 | /* MII contorller setting */ | 1379 | /* MII controller setting */ |
1380 | mdp->mii_bus = alloc_mdio_bitbang(&bitbang->ctrl); | 1380 | mdp->mii_bus = alloc_mdio_bitbang(&bitbang->ctrl); |
1381 | if (!mdp->mii_bus) { | 1381 | if (!mdp->mii_bus) { |
1382 | ret = -ENOMEM; | 1382 | ret = -ENOMEM; |
diff --git a/drivers/net/tulip/dmfe.c b/drivers/net/tulip/dmfe.c index 29e6c63d39fd..0bc4f3030a80 100644 --- a/drivers/net/tulip/dmfe.c +++ b/drivers/net/tulip/dmfe.c | |||
@@ -589,7 +589,7 @@ static int dmfe_open(struct DEVICE *dev) | |||
589 | db->dm910x_chk_mode = 1; /* Enter the check mode */ | 589 | db->dm910x_chk_mode = 1; /* Enter the check mode */ |
590 | } | 590 | } |
591 | 591 | ||
592 | /* Initilize DM910X board */ | 592 | /* Initialize DM910X board */ |
593 | dmfe_init_dm910x(dev); | 593 | dmfe_init_dm910x(dev); |
594 | 594 | ||
595 | /* Active System Interface */ | 595 | /* Active System Interface */ |
@@ -606,9 +606,9 @@ static int dmfe_open(struct DEVICE *dev) | |||
606 | } | 606 | } |
607 | 607 | ||
608 | 608 | ||
609 | /* Initilize DM910X board | 609 | /* Initialize DM910X board |
610 | * Reset DM910X board | 610 | * Reset DM910X board |
611 | * Initilize TX/Rx descriptor chain structure | 611 | * Initialize TX/Rx descriptor chain structure |
612 | * Send the set-up frame | 612 | * Send the set-up frame |
613 | * Enable Tx/Rx machine | 613 | * Enable Tx/Rx machine |
614 | */ | 614 | */ |
@@ -649,7 +649,7 @@ static void dmfe_init_dm910x(struct DEVICE *dev) | |||
649 | if ( !(db->media_mode & DMFE_AUTO) ) | 649 | if ( !(db->media_mode & DMFE_AUTO) ) |
650 | db->op_mode = db->media_mode; /* Force Mode */ | 650 | db->op_mode = db->media_mode; /* Force Mode */ |
651 | 651 | ||
652 | /* Initiliaze Transmit/Receive decriptor and CR3/4 */ | 652 | /* Initialize Transmit/Receive decriptor and CR3/4 */ |
653 | dmfe_descriptor_init(db, ioaddr); | 653 | dmfe_descriptor_init(db, ioaddr); |
654 | 654 | ||
655 | /* Init CR6 to program DM910x operation */ | 655 | /* Init CR6 to program DM910x operation */ |
@@ -1288,7 +1288,7 @@ static void dmfe_timer(unsigned long data) | |||
1288 | * Stop DM910X board | 1288 | * Stop DM910X board |
1289 | * Free Tx/Rx allocated memory | 1289 | * Free Tx/Rx allocated memory |
1290 | * Reset DM910X board | 1290 | * Reset DM910X board |
1291 | * Re-initilize DM910X board | 1291 | * Re-initialize DM910X board |
1292 | */ | 1292 | */ |
1293 | 1293 | ||
1294 | static void dmfe_dynamic_reset(struct DEVICE *dev) | 1294 | static void dmfe_dynamic_reset(struct DEVICE *dev) |
@@ -1316,7 +1316,7 @@ static void dmfe_dynamic_reset(struct DEVICE *dev) | |||
1316 | netif_carrier_off(dev); | 1316 | netif_carrier_off(dev); |
1317 | db->wait_reset = 0; | 1317 | db->wait_reset = 0; |
1318 | 1318 | ||
1319 | /* Re-initilize DM910X board */ | 1319 | /* Re-initialize DM910X board */ |
1320 | dmfe_init_dm910x(dev); | 1320 | dmfe_init_dm910x(dev); |
1321 | 1321 | ||
1322 | /* Restart upper layer interface */ | 1322 | /* Restart upper layer interface */ |
@@ -1447,7 +1447,7 @@ static void update_cr6(u32 cr6_data, unsigned long ioaddr) | |||
1447 | 1447 | ||
1448 | /* | 1448 | /* |
1449 | * Send a setup frame for DM9132 | 1449 | * Send a setup frame for DM9132 |
1450 | * This setup frame initilize DM910X address filter mode | 1450 | * This setup frame initialize DM910X address filter mode |
1451 | */ | 1451 | */ |
1452 | 1452 | ||
1453 | static void dm9132_id_table(struct DEVICE *dev) | 1453 | static void dm9132_id_table(struct DEVICE *dev) |
@@ -1489,7 +1489,7 @@ static void dm9132_id_table(struct DEVICE *dev) | |||
1489 | 1489 | ||
1490 | /* | 1490 | /* |
1491 | * Send a setup frame for DM9102/DM9102A | 1491 | * Send a setup frame for DM9102/DM9102A |
1492 | * This setup frame initilize DM910X address filter mode | 1492 | * This setup frame initialize DM910X address filter mode |
1493 | */ | 1493 | */ |
1494 | 1494 | ||
1495 | static void send_filter_frame(struct DEVICE *dev) | 1495 | static void send_filter_frame(struct DEVICE *dev) |
@@ -2142,7 +2142,7 @@ static int dmfe_resume(struct pci_dev *pci_dev) | |||
2142 | pci_set_power_state(pci_dev, PCI_D0); | 2142 | pci_set_power_state(pci_dev, PCI_D0); |
2143 | pci_restore_state(pci_dev); | 2143 | pci_restore_state(pci_dev); |
2144 | 2144 | ||
2145 | /* Re-initilize DM910X board */ | 2145 | /* Re-initialize DM910X board */ |
2146 | dmfe_init_dm910x(dev); | 2146 | dmfe_init_dm910x(dev); |
2147 | 2147 | ||
2148 | /* Disable WOL */ | 2148 | /* Disable WOL */ |
@@ -2196,7 +2196,7 @@ MODULE_PARM_DESC(SF_mode, "Davicom DM9xxx special function " | |||
2196 | 2196 | ||
2197 | /* Description: | 2197 | /* Description: |
2198 | * when user used insmod to add module, system invoked init_module() | 2198 | * when user used insmod to add module, system invoked init_module() |
2199 | * to initilize and register. | 2199 | * to initialize and register. |
2200 | */ | 2200 | */ |
2201 | 2201 | ||
2202 | static int __init dmfe_init_module(void) | 2202 | static int __init dmfe_init_module(void) |
diff --git a/drivers/net/wimax/i2400m/control.c b/drivers/net/wimax/i2400m/control.c index 2f725d0cc762..9fb03082153a 100644 --- a/drivers/net/wimax/i2400m/control.c +++ b/drivers/net/wimax/i2400m/control.c | |||
@@ -50,7 +50,7 @@ | |||
50 | * | 50 | * |
51 | * ROADMAP | 51 | * ROADMAP |
52 | * | 52 | * |
53 | * i2400m_dev_initalize() Called by i2400m_dev_start() | 53 | * i2400m_dev_initialize() Called by i2400m_dev_start() |
54 | * i2400m_set_init_config() | 54 | * i2400m_set_init_config() |
55 | * i2400m_cmd_get_state() | 55 | * i2400m_cmd_get_state() |
56 | * i2400m_dev_shutdown() Called by i2400m_dev_stop() | 56 | * i2400m_dev_shutdown() Called by i2400m_dev_stop() |
diff --git a/drivers/net/wireless/hostap/hostap_ap.c b/drivers/net/wireless/hostap/hostap_ap.c index 9cadaa296fac..dbb986946e1a 100644 --- a/drivers/net/wireless/hostap/hostap_ap.c +++ b/drivers/net/wireless/hostap/hostap_ap.c | |||
@@ -1224,7 +1224,7 @@ static void ap_crypt_init(struct ap_data *ap) | |||
1224 | 1224 | ||
1225 | 1225 | ||
1226 | /* Generate challenge data for shared key authentication. IEEE 802.11 specifies | 1226 | /* Generate challenge data for shared key authentication. IEEE 802.11 specifies |
1227 | * that WEP algorithm is used for generating challange. This should be unique, | 1227 | * that WEP algorithm is used for generating challenge. This should be unique, |
1228 | * but otherwise there is not really need for randomness etc. Initialize WEP | 1228 | * but otherwise there is not really need for randomness etc. Initialize WEP |
1229 | * with pseudo random key and then use increasing IV to get unique challenge | 1229 | * with pseudo random key and then use increasing IV to get unique challenge |
1230 | * streams. | 1230 | * streams. |
diff --git a/drivers/net/wireless/hostap/hostap_hw.c b/drivers/net/wireless/hostap/hostap_hw.c index 2f999fc94f60..e9d9d622a9b0 100644 --- a/drivers/net/wireless/hostap/hostap_hw.c +++ b/drivers/net/wireless/hostap/hostap_hw.c | |||
@@ -1896,7 +1896,7 @@ fail: | |||
1896 | /* Some SMP systems have reported number of odd errors with hostap_pci. fid | 1896 | /* Some SMP systems have reported number of odd errors with hostap_pci. fid |
1897 | * register has changed values between consecutive reads for an unknown reason. | 1897 | * register has changed values between consecutive reads for an unknown reason. |
1898 | * This should really not happen, so more debugging is needed. This test | 1898 | * This should really not happen, so more debugging is needed. This test |
1899 | * version is a big slower, but it will detect most of such register changes | 1899 | * version is a bit slower, but it will detect most of such register changes |
1900 | * and will try to get the correct fid eventually. */ | 1900 | * and will try to get the correct fid eventually. */ |
1901 | #define EXTRA_FID_READ_TESTS | 1901 | #define EXTRA_FID_READ_TESTS |
1902 | 1902 | ||