diff options
author | Joe Perches <joe@perches.com> | 2015-03-06 23:49:12 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-03-08 22:54:22 -0400 |
commit | dbedd44e982d61c156337b1a3fb252b24085f8e3 (patch) | |
tree | 51e33a44db4e38f5a560c643a880cf08f7280b2d /drivers | |
parent | cbe21d92e4d501e4895ef668b43fd8998c9b3b02 (diff) |
ethernet: codespell comment spelling fixes
To test a checkpatch spelling patch, I ran codespell against
drivers/net/ethernet/.
$ git ls-files drivers/net/ethernet/ | \
while read file ; do \
codespell -w $file; \
done
I removed a false positive in e1000_hw.h
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
61 files changed, 92 insertions, 92 deletions
diff --git a/drivers/net/ethernet/allwinner/sun4i-emac.c b/drivers/net/ethernet/allwinner/sun4i-emac.c index f3470d96837a..bab01c849165 100644 --- a/drivers/net/ethernet/allwinner/sun4i-emac.c +++ b/drivers/net/ethernet/allwinner/sun4i-emac.c | |||
@@ -757,7 +757,7 @@ static void emac_shutdown(struct net_device *dev) | |||
757 | /* Disable all interrupt */ | 757 | /* Disable all interrupt */ |
758 | writel(0, db->membase + EMAC_INT_CTL_REG); | 758 | writel(0, db->membase + EMAC_INT_CTL_REG); |
759 | 759 | ||
760 | /* clear interupt status */ | 760 | /* clear interrupt status */ |
761 | reg_val = readl(db->membase + EMAC_INT_STA_REG); | 761 | reg_val = readl(db->membase + EMAC_INT_STA_REG); |
762 | writel(reg_val, db->membase + EMAC_INT_STA_REG); | 762 | writel(reg_val, db->membase + EMAC_INT_STA_REG); |
763 | 763 | ||
diff --git a/drivers/net/ethernet/amd/amd8111e.c b/drivers/net/ethernet/amd/amd8111e.c index 4c2ae2221780..94960055fa1f 100644 --- a/drivers/net/ethernet/amd/amd8111e.c +++ b/drivers/net/ethernet/amd/amd8111e.c | |||
@@ -723,13 +723,13 @@ static int amd8111e_rx_poll(struct napi_struct *napi, int budget) | |||
723 | * the last correctly noting the error. | 723 | * the last correctly noting the error. |
724 | */ | 724 | */ |
725 | if(status & ERR_BIT) { | 725 | if(status & ERR_BIT) { |
726 | /* reseting flags */ | 726 | /* resetting flags */ |
727 | lp->rx_ring[rx_index].rx_flags &= RESET_RX_FLAGS; | 727 | lp->rx_ring[rx_index].rx_flags &= RESET_RX_FLAGS; |
728 | goto err_next_pkt; | 728 | goto err_next_pkt; |
729 | } | 729 | } |
730 | /* check for STP and ENP */ | 730 | /* check for STP and ENP */ |
731 | if(!((status & STP_BIT) && (status & ENP_BIT))){ | 731 | if(!((status & STP_BIT) && (status & ENP_BIT))){ |
732 | /* reseting flags */ | 732 | /* resetting flags */ |
733 | lp->rx_ring[rx_index].rx_flags &= RESET_RX_FLAGS; | 733 | lp->rx_ring[rx_index].rx_flags &= RESET_RX_FLAGS; |
734 | goto err_next_pkt; | 734 | goto err_next_pkt; |
735 | } | 735 | } |
diff --git a/drivers/net/ethernet/amd/amd8111e.h b/drivers/net/ethernet/amd/amd8111e.h index a75092d584cc..7cdb18512407 100644 --- a/drivers/net/ethernet/amd/amd8111e.h +++ b/drivers/net/ethernet/amd/amd8111e.h | |||
@@ -614,7 +614,7 @@ typedef enum { | |||
614 | /* Assume contoller gets data 10 times the maximum processing time */ | 614 | /* Assume contoller gets data 10 times the maximum processing time */ |
615 | #define REPEAT_CNT 10 | 615 | #define REPEAT_CNT 10 |
616 | 616 | ||
617 | /* amd8111e decriptor flag definitions */ | 617 | /* amd8111e descriptor flag definitions */ |
618 | typedef enum { | 618 | typedef enum { |
619 | 619 | ||
620 | OWN_BIT = (1 << 15), | 620 | OWN_BIT = (1 << 15), |
diff --git a/drivers/net/ethernet/amd/xgbe/xgbe.h b/drivers/net/ethernet/amd/xgbe/xgbe.h index 13e8f95c077c..1eea3e5a5d08 100644 --- a/drivers/net/ethernet/amd/xgbe/xgbe.h +++ b/drivers/net/ethernet/amd/xgbe/xgbe.h | |||
@@ -620,7 +620,7 @@ struct xgbe_hw_features { | |||
620 | unsigned int mgk; /* PMT magic packet */ | 620 | unsigned int mgk; /* PMT magic packet */ |
621 | unsigned int mmc; /* RMON module */ | 621 | unsigned int mmc; /* RMON module */ |
622 | unsigned int aoe; /* ARP Offload */ | 622 | unsigned int aoe; /* ARP Offload */ |
623 | unsigned int ts; /* IEEE 1588-2008 Adavanced Timestamp */ | 623 | unsigned int ts; /* IEEE 1588-2008 Advanced Timestamp */ |
624 | unsigned int eee; /* Energy Efficient Ethernet */ | 624 | unsigned int eee; /* Energy Efficient Ethernet */ |
625 | unsigned int tx_coe; /* Tx Checksum Offload */ | 625 | unsigned int tx_coe; /* Tx Checksum Offload */ |
626 | unsigned int rx_coe; /* Rx Checksum Offload */ | 626 | unsigned int rx_coe; /* Rx Checksum Offload */ |
diff --git a/drivers/net/ethernet/apple/mace.c b/drivers/net/ethernet/apple/mace.c index 842fe7684904..7fcaf0da42a8 100644 --- a/drivers/net/ethernet/apple/mace.c +++ b/drivers/net/ethernet/apple/mace.c | |||
@@ -720,7 +720,7 @@ static irqreturn_t mace_interrupt(int irq, void *dev_id) | |||
720 | mace_reset(dev); | 720 | mace_reset(dev); |
721 | /* | 721 | /* |
722 | * XXX mace likes to hang the machine after a xmtfs error. | 722 | * XXX mace likes to hang the machine after a xmtfs error. |
723 | * This is hard to reproduce, reseting *may* help | 723 | * This is hard to reproduce, resetting *may* help |
724 | */ | 724 | */ |
725 | } | 725 | } |
726 | cp = mp->tx_cmds + NCMDS_TX * i; | 726 | cp = mp->tx_cmds + NCMDS_TX * i; |
diff --git a/drivers/net/ethernet/apple/macmace.c b/drivers/net/ethernet/apple/macmace.c index 6e66127e6abf..89914ca17a49 100644 --- a/drivers/net/ethernet/apple/macmace.c +++ b/drivers/net/ethernet/apple/macmace.c | |||
@@ -575,7 +575,7 @@ static irqreturn_t mace_interrupt(int irq, void *dev_id) | |||
575 | mace_reset(dev); | 575 | mace_reset(dev); |
576 | /* | 576 | /* |
577 | * XXX mace likes to hang the machine after a xmtfs error. | 577 | * XXX mace likes to hang the machine after a xmtfs error. |
578 | * This is hard to reproduce, reseting *may* help | 578 | * This is hard to reproduce, resetting *may* help |
579 | */ | 579 | */ |
580 | } | 580 | } |
581 | /* dma should have finished */ | 581 | /* dma should have finished */ |
diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_hw.c b/drivers/net/ethernet/atheros/atl1c/atl1c_hw.c index 52fdfe225978..a8b80c56ac25 100644 --- a/drivers/net/ethernet/atheros/atl1c/atl1c_hw.c +++ b/drivers/net/ethernet/atheros/atl1c/atl1c_hw.c | |||
@@ -307,7 +307,7 @@ void atl1c_start_phy_polling(struct atl1c_hw *hw, u16 clk_sel) | |||
307 | 307 | ||
308 | /* | 308 | /* |
309 | * atl1c_read_phy_core | 309 | * atl1c_read_phy_core |
310 | * core funtion to read register in PHY via MDIO control regsiter. | 310 | * core function to read register in PHY via MDIO control regsiter. |
311 | * ext: extension register (see IEEE 802.3) | 311 | * ext: extension register (see IEEE 802.3) |
312 | * dev: device address (see IEEE 802.3 DEVAD, PRTAD is fixed to 0) | 312 | * dev: device address (see IEEE 802.3 DEVAD, PRTAD is fixed to 0) |
313 | * reg: reg to read | 313 | * reg: reg to read |
@@ -356,7 +356,7 @@ int atl1c_read_phy_core(struct atl1c_hw *hw, bool ext, u8 dev, | |||
356 | 356 | ||
357 | /* | 357 | /* |
358 | * atl1c_write_phy_core | 358 | * atl1c_write_phy_core |
359 | * core funtion to write to register in PHY via MDIO control regsiter. | 359 | * core function to write to register in PHY via MDIO control register. |
360 | * ext: extension register (see IEEE 802.3) | 360 | * ext: extension register (see IEEE 802.3) |
361 | * dev: device address (see IEEE 802.3 DEVAD, PRTAD is fixed to 0) | 361 | * dev: device address (see IEEE 802.3 DEVAD, PRTAD is fixed to 0) |
362 | * reg: reg to write | 362 | * reg: reg to write |
diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c index 587f63e87588..932bd1862f7a 100644 --- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c +++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c | |||
@@ -752,7 +752,7 @@ static void atl1c_patch_assign(struct atl1c_hw *hw) | |||
752 | 752 | ||
753 | if (hw->device_id == PCI_DEVICE_ID_ATHEROS_L2C_B2 && | 753 | if (hw->device_id == PCI_DEVICE_ID_ATHEROS_L2C_B2 && |
754 | hw->revision_id == L2CB_V21) { | 754 | hw->revision_id == L2CB_V21) { |
755 | /* config acess mode */ | 755 | /* config access mode */ |
756 | pci_write_config_dword(pdev, REG_PCIE_IND_ACC_ADDR, | 756 | pci_write_config_dword(pdev, REG_PCIE_IND_ACC_ADDR, |
757 | REG_PCIE_DEV_MISC_CTRL); | 757 | REG_PCIE_DEV_MISC_CTRL); |
758 | pci_read_config_dword(pdev, REG_PCIE_IND_ACC_DATA, &misc_ctrl); | 758 | pci_read_config_dword(pdev, REG_PCIE_IND_ACC_DATA, &misc_ctrl); |
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_init.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_init.h index bd90e50bd8e6..d6e1975b7b69 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_init.h +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_init.h | |||
@@ -278,7 +278,7 @@ static inline void bnx2x_dcb_config_qm(struct bnx2x *bp, enum cos_mode mode, | |||
278 | } | 278 | } |
279 | 279 | ||
280 | 280 | ||
281 | /* congestion managment port init api description | 281 | /* congestion management port init api description |
282 | * the api works as follows: | 282 | * the api works as follows: |
283 | * the driver should pass the cmng_init_input struct, the port_init function | 283 | * the driver should pass the cmng_init_input struct, the port_init function |
284 | * will prepare the required internal ram structure which will be passed back | 284 | * will prepare the required internal ram structure which will be passed back |
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c index 778e4cd32571..b7c77b26a8a4 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c | |||
@@ -563,7 +563,7 @@ static void bnx2x_ets_e3b0_set_credit_upper_bound_nig( | |||
563 | * Will return the NIG ETS registers to init values.Except | 563 | * Will return the NIG ETS registers to init values.Except |
564 | * credit_upper_bound. | 564 | * credit_upper_bound. |
565 | * That isn't used in this configuration (No WFQ is enabled) and will be | 565 | * That isn't used in this configuration (No WFQ is enabled) and will be |
566 | * configured acording to spec | 566 | * configured according to spec |
567 | *. | 567 | *. |
568 | ******************************************************************************/ | 568 | ******************************************************************************/ |
569 | static void bnx2x_ets_e3b0_nig_disabled(const struct link_params *params, | 569 | static void bnx2x_ets_e3b0_nig_disabled(const struct link_params *params, |
@@ -680,7 +680,7 @@ static void bnx2x_ets_e3b0_set_credit_upper_bound_pbf( | |||
680 | * Will return the PBF ETS registers to init values.Except | 680 | * Will return the PBF ETS registers to init values.Except |
681 | * credit_upper_bound. | 681 | * credit_upper_bound. |
682 | * That isn't used in this configuration (No WFQ is enabled) and will be | 682 | * That isn't used in this configuration (No WFQ is enabled) and will be |
683 | * configured acording to spec | 683 | * configured according to spec |
684 | *. | 684 | *. |
685 | ******************************************************************************/ | 685 | ******************************************************************************/ |
686 | static void bnx2x_ets_e3b0_pbf_disabled(const struct link_params *params) | 686 | static void bnx2x_ets_e3b0_pbf_disabled(const struct link_params *params) |
@@ -738,7 +738,7 @@ static void bnx2x_ets_e3b0_pbf_disabled(const struct link_params *params) | |||
738 | } | 738 | } |
739 | /****************************************************************************** | 739 | /****************************************************************************** |
740 | * Description: | 740 | * Description: |
741 | * E3B0 disable will return basicly the values to init values. | 741 | * E3B0 disable will return basically the values to init values. |
742 | *. | 742 | *. |
743 | ******************************************************************************/ | 743 | ******************************************************************************/ |
744 | static int bnx2x_ets_e3b0_disabled(const struct link_params *params, | 744 | static int bnx2x_ets_e3b0_disabled(const struct link_params *params, |
@@ -761,7 +761,7 @@ static int bnx2x_ets_e3b0_disabled(const struct link_params *params, | |||
761 | 761 | ||
762 | /****************************************************************************** | 762 | /****************************************************************************** |
763 | * Description: | 763 | * Description: |
764 | * Disable will return basicly the values to init values. | 764 | * Disable will return basically the values to init values. |
765 | * | 765 | * |
766 | ******************************************************************************/ | 766 | ******************************************************************************/ |
767 | int bnx2x_ets_disabled(struct link_params *params, | 767 | int bnx2x_ets_disabled(struct link_params *params, |
@@ -2938,7 +2938,7 @@ static int bnx2x_eee_initial_config(struct link_params *params, | |||
2938 | { | 2938 | { |
2939 | vars->eee_status |= ((u32) mode) << SHMEM_EEE_SUPPORTED_SHIFT; | 2939 | vars->eee_status |= ((u32) mode) << SHMEM_EEE_SUPPORTED_SHIFT; |
2940 | 2940 | ||
2941 | /* Propogate params' bits --> vars (for migration exposure) */ | 2941 | /* Propagate params' bits --> vars (for migration exposure) */ |
2942 | if (params->eee_mode & EEE_MODE_ENABLE_LPI) | 2942 | if (params->eee_mode & EEE_MODE_ENABLE_LPI) |
2943 | vars->eee_status |= SHMEM_EEE_LPI_REQUESTED_BIT; | 2943 | vars->eee_status |= SHMEM_EEE_LPI_REQUESTED_BIT; |
2944 | else | 2944 | else |
@@ -13308,7 +13308,7 @@ static void bnx2x_check_over_curr(struct link_params *params, | |||
13308 | vars->phy_flags &= ~PHY_OVER_CURRENT_FLAG; | 13308 | vars->phy_flags &= ~PHY_OVER_CURRENT_FLAG; |
13309 | } | 13309 | } |
13310 | 13310 | ||
13311 | /* Returns 0 if no change occured since last check; 1 otherwise. */ | 13311 | /* Returns 0 if no change occurred since last check; 1 otherwise. */ |
13312 | static u8 bnx2x_analyze_link_error(struct link_params *params, | 13312 | static u8 bnx2x_analyze_link_error(struct link_params *params, |
13313 | struct link_vars *vars, u32 status, | 13313 | struct link_vars *vars, u32 status, |
13314 | u32 phy_flag, u32 link_flag, u8 notify) | 13314 | u32 phy_flag, u32 link_flag, u8 notify) |
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h index 6fe547c93e74..0770e4bff89b 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h | |||
@@ -29,7 +29,7 @@ | |||
29 | #define ATC_ATC_INT_STS_REG_ATC_TCPL_TO_NOT_PEND (0x1<<1) | 29 | #define ATC_ATC_INT_STS_REG_ATC_TCPL_TO_NOT_PEND (0x1<<1) |
30 | /* [RW 1] Initiate the ATC array - reset all the valid bits */ | 30 | /* [RW 1] Initiate the ATC array - reset all the valid bits */ |
31 | #define ATC_REG_ATC_INIT_ARRAY 0x1100b8 | 31 | #define ATC_REG_ATC_INIT_ARRAY 0x1100b8 |
32 | /* [R 1] ATC initalization done */ | 32 | /* [R 1] ATC initialization done */ |
33 | #define ATC_REG_ATC_INIT_DONE 0x1100bc | 33 | #define ATC_REG_ATC_INIT_DONE 0x1100bc |
34 | /* [RC 6] Interrupt register #0 read clear */ | 34 | /* [RC 6] Interrupt register #0 read clear */ |
35 | #define ATC_REG_ATC_INT_STS_CLR 0x1101c0 | 35 | #define ATC_REG_ATC_INT_STS_CLR 0x1101c0 |
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c index d1608297c773..612cafb5df53 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c | |||
@@ -1620,7 +1620,7 @@ void bnx2x_memset_stats(struct bnx2x *bp) | |||
1620 | if (bp->port.pmf && bp->port.port_stx) | 1620 | if (bp->port.pmf && bp->port.port_stx) |
1621 | bnx2x_port_stats_base_init(bp); | 1621 | bnx2x_port_stats_base_init(bp); |
1622 | 1622 | ||
1623 | /* mark the end of statistics initializiation */ | 1623 | /* mark the end of statistics initialization */ |
1624 | bp->stats_init = false; | 1624 | bp->stats_init = false; |
1625 | } | 1625 | } |
1626 | 1626 | ||
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c index be40eabc5304..15b2d1647560 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c | |||
@@ -800,7 +800,7 @@ int bnx2x_vfpf_config_rss(struct bnx2x *bp, | |||
800 | req->rss_key_size = T_ETH_RSS_KEY; | 800 | req->rss_key_size = T_ETH_RSS_KEY; |
801 | req->rss_result_mask = params->rss_result_mask; | 801 | req->rss_result_mask = params->rss_result_mask; |
802 | 802 | ||
803 | /* flags handled individually for backward/forward compatability */ | 803 | /* flags handled individually for backward/forward compatibility */ |
804 | if (params->rss_flags & (1 << BNX2X_RSS_MODE_DISABLED)) | 804 | if (params->rss_flags & (1 << BNX2X_RSS_MODE_DISABLED)) |
805 | req->rss_flags |= VFPF_RSS_MODE_DISABLED; | 805 | req->rss_flags |= VFPF_RSS_MODE_DISABLED; |
806 | if (params->rss_flags & (1 << BNX2X_RSS_MODE_REGULAR)) | 806 | if (params->rss_flags & (1 << BNX2X_RSS_MODE_REGULAR)) |
@@ -1869,7 +1869,7 @@ static void bnx2x_vf_mbx_update_rss(struct bnx2x *bp, struct bnx2x_virtf *vf, | |||
1869 | rss.rss_obj = &vf->rss_conf_obj; | 1869 | rss.rss_obj = &vf->rss_conf_obj; |
1870 | rss.rss_result_mask = rss_tlv->rss_result_mask; | 1870 | rss.rss_result_mask = rss_tlv->rss_result_mask; |
1871 | 1871 | ||
1872 | /* flags handled individually for backward/forward compatability */ | 1872 | /* flags handled individually for backward/forward compatibility */ |
1873 | rss.rss_flags = 0; | 1873 | rss.rss_flags = 0; |
1874 | rss.ramrod_flags = 0; | 1874 | rss.ramrod_flags = 0; |
1875 | 1875 | ||
diff --git a/drivers/net/ethernet/brocade/bna/bfa_defs_cna.h b/drivers/net/ethernet/brocade/bna/bfa_defs_cna.h index 63e300f5ba41..a37326d44fbb 100644 --- a/drivers/net/ethernet/brocade/bna/bfa_defs_cna.h +++ b/drivers/net/ethernet/brocade/bna/bfa_defs_cna.h | |||
@@ -135,7 +135,7 @@ struct bfa_cee_lldp_str { | |||
135 | u8 value[BFA_CEE_LLDP_MAX_STRING_LEN]; | 135 | u8 value[BFA_CEE_LLDP_MAX_STRING_LEN]; |
136 | }; | 136 | }; |
137 | 137 | ||
138 | /* LLDP paramters */ | 138 | /* LLDP parameters */ |
139 | struct bfa_cee_lldp_cfg { | 139 | struct bfa_cee_lldp_cfg { |
140 | struct bfa_cee_lldp_str chassis_id; | 140 | struct bfa_cee_lldp_str chassis_id; |
141 | struct bfa_cee_lldp_str port_id; | 141 | struct bfa_cee_lldp_str port_id; |
diff --git a/drivers/net/ethernet/brocade/bna/bfa_ioc.c b/drivers/net/ethernet/brocade/bna/bfa_ioc.c index f2d13238b02e..594a2ab36d31 100644 --- a/drivers/net/ethernet/brocade/bna/bfa_ioc.c +++ b/drivers/net/ethernet/brocade/bna/bfa_ioc.c | |||
@@ -1340,7 +1340,7 @@ bfa_ioc_fwver_md5_check(struct bfi_ioc_image_hdr *fwhdr_1, | |||
1340 | return true; | 1340 | return true; |
1341 | } | 1341 | } |
1342 | 1342 | ||
1343 | /* Returns TRUE if major minor and maintainence are same. | 1343 | /* Returns TRUE if major minor and maintenance are same. |
1344 | * If patch version are same, check for MD5 Checksum to be same. | 1344 | * If patch version are same, check for MD5 Checksum to be same. |
1345 | */ | 1345 | */ |
1346 | static bool | 1346 | static bool |
diff --git a/drivers/net/ethernet/brocade/bna/bfa_ioc_ct.c b/drivers/net/ethernet/brocade/bna/bfa_ioc_ct.c index 66c8507d7717..2e72445dbb4f 100644 --- a/drivers/net/ethernet/brocade/bna/bfa_ioc_ct.c +++ b/drivers/net/ethernet/brocade/bna/bfa_ioc_ct.c | |||
@@ -699,7 +699,7 @@ bfa_ioc_ct2_sclk_init(void __iomem *rb) | |||
699 | 699 | ||
700 | /* | 700 | /* |
701 | * Ignore mode and program for the max clock (which is FC16) | 701 | * Ignore mode and program for the max clock (which is FC16) |
702 | * Firmware/NFC will do the PLL init appropiately | 702 | * Firmware/NFC will do the PLL init appropriately |
703 | */ | 703 | */ |
704 | r32 = readl((rb + CT2_APP_PLL_SCLK_CTL_REG)); | 704 | r32 = readl((rb + CT2_APP_PLL_SCLK_CTL_REG)); |
705 | r32 &= ~(__APP_PLL_SCLK_REFCLK_SEL | __APP_PLL_SCLK_CLK_DIV2); | 705 | r32 &= ~(__APP_PLL_SCLK_REFCLK_SEL | __APP_PLL_SCLK_CLK_DIV2); |
diff --git a/drivers/net/ethernet/brocade/bna/bfi.h b/drivers/net/ethernet/brocade/bna/bfi.h index f1e1129e6241..2bcde4042268 100644 --- a/drivers/net/ethernet/brocade/bna/bfi.h +++ b/drivers/net/ethernet/brocade/bna/bfi.h | |||
@@ -159,8 +159,8 @@ enum bfi_asic_gen { | |||
159 | }; | 159 | }; |
160 | 160 | ||
161 | enum bfi_asic_mode { | 161 | enum bfi_asic_mode { |
162 | BFI_ASIC_MODE_FC = 1, /* FC upto 8G speed */ | 162 | BFI_ASIC_MODE_FC = 1, /* FC up to 8G speed */ |
163 | BFI_ASIC_MODE_FC16 = 2, /* FC upto 16G speed */ | 163 | BFI_ASIC_MODE_FC16 = 2, /* FC up to 16G speed */ |
164 | BFI_ASIC_MODE_ETH = 3, /* Ethernet ports */ | 164 | BFI_ASIC_MODE_ETH = 3, /* Ethernet ports */ |
165 | BFI_ASIC_MODE_COMBO = 4, /* FC 16G and Ethernet 10G port */ | 165 | BFI_ASIC_MODE_COMBO = 4, /* FC 16G and Ethernet 10G port */ |
166 | }; | 166 | }; |
diff --git a/drivers/net/ethernet/brocade/bna/bna_hw_defs.h b/drivers/net/ethernet/brocade/bna/bna_hw_defs.h index c5feab130d6d..174af0e9d056 100644 --- a/drivers/net/ethernet/brocade/bna/bna_hw_defs.h +++ b/drivers/net/ethernet/brocade/bna/bna_hw_defs.h | |||
@@ -363,7 +363,7 @@ struct bna_txq_wi_vector { | |||
363 | 363 | ||
364 | /* TxQ Entry Structure | 364 | /* TxQ Entry Structure |
365 | * | 365 | * |
366 | * BEWARE: Load values into this structure with correct endianess. | 366 | * BEWARE: Load values into this structure with correct endianness. |
367 | */ | 367 | */ |
368 | struct bna_txq_entry { | 368 | struct bna_txq_entry { |
369 | union { | 369 | union { |
diff --git a/drivers/net/ethernet/calxeda/xgmac.c b/drivers/net/ethernet/calxeda/xgmac.c index 47bfea24b9e1..63efa0dc45ba 100644 --- a/drivers/net/ethernet/calxeda/xgmac.c +++ b/drivers/net/ethernet/calxeda/xgmac.c | |||
@@ -47,9 +47,9 @@ | |||
47 | #define XGMAC_REMOTE_WAKE 0x00000700 /* Remote Wake-Up Frm Filter */ | 47 | #define XGMAC_REMOTE_WAKE 0x00000700 /* Remote Wake-Up Frm Filter */ |
48 | #define XGMAC_PMT 0x00000704 /* PMT Control and Status */ | 48 | #define XGMAC_PMT 0x00000704 /* PMT Control and Status */ |
49 | #define XGMAC_MMC_CTRL 0x00000800 /* XGMAC MMC Control */ | 49 | #define XGMAC_MMC_CTRL 0x00000800 /* XGMAC MMC Control */ |
50 | #define XGMAC_MMC_INTR_RX 0x00000804 /* Recieve Interrupt */ | 50 | #define XGMAC_MMC_INTR_RX 0x00000804 /* Receive Interrupt */ |
51 | #define XGMAC_MMC_INTR_TX 0x00000808 /* Transmit Interrupt */ | 51 | #define XGMAC_MMC_INTR_TX 0x00000808 /* Transmit Interrupt */ |
52 | #define XGMAC_MMC_INTR_MASK_RX 0x0000080c /* Recieve Interrupt Mask */ | 52 | #define XGMAC_MMC_INTR_MASK_RX 0x0000080c /* Receive Interrupt Mask */ |
53 | #define XGMAC_MMC_INTR_MASK_TX 0x00000810 /* Transmit Interrupt Mask */ | 53 | #define XGMAC_MMC_INTR_MASK_TX 0x00000810 /* Transmit Interrupt Mask */ |
54 | 54 | ||
55 | /* Hardware TX Statistics Counters */ | 55 | /* Hardware TX Statistics Counters */ |
@@ -153,7 +153,7 @@ | |||
153 | #define XGMAC_FLOW_CTRL_PT_MASK 0xffff0000 /* Pause Time Mask */ | 153 | #define XGMAC_FLOW_CTRL_PT_MASK 0xffff0000 /* Pause Time Mask */ |
154 | #define XGMAC_FLOW_CTRL_PT_SHIFT 16 | 154 | #define XGMAC_FLOW_CTRL_PT_SHIFT 16 |
155 | #define XGMAC_FLOW_CTRL_DZQP 0x00000080 /* Disable Zero-Quanta Phase */ | 155 | #define XGMAC_FLOW_CTRL_DZQP 0x00000080 /* Disable Zero-Quanta Phase */ |
156 | #define XGMAC_FLOW_CTRL_PLT 0x00000020 /* Pause Low Threshhold */ | 156 | #define XGMAC_FLOW_CTRL_PLT 0x00000020 /* Pause Low Threshold */ |
157 | #define XGMAC_FLOW_CTRL_PLT_MASK 0x00000030 /* PLT MASK */ | 157 | #define XGMAC_FLOW_CTRL_PLT_MASK 0x00000030 /* PLT MASK */ |
158 | #define XGMAC_FLOW_CTRL_UP 0x00000008 /* Unicast Pause Frame Detect */ | 158 | #define XGMAC_FLOW_CTRL_UP 0x00000008 /* Unicast Pause Frame Detect */ |
159 | #define XGMAC_FLOW_CTRL_RFE 0x00000004 /* Rx Flow Control Enable */ | 159 | #define XGMAC_FLOW_CTRL_RFE 0x00000004 /* Rx Flow Control Enable */ |
@@ -254,18 +254,18 @@ | |||
254 | /* XGMAC Operation Mode Register */ | 254 | /* XGMAC Operation Mode Register */ |
255 | #define XGMAC_OMR_TSF 0x00200000 /* TX FIFO Store and Forward */ | 255 | #define XGMAC_OMR_TSF 0x00200000 /* TX FIFO Store and Forward */ |
256 | #define XGMAC_OMR_FTF 0x00100000 /* Flush Transmit FIFO */ | 256 | #define XGMAC_OMR_FTF 0x00100000 /* Flush Transmit FIFO */ |
257 | #define XGMAC_OMR_TTC 0x00020000 /* Transmit Threshhold Ctrl */ | 257 | #define XGMAC_OMR_TTC 0x00020000 /* Transmit Threshold Ctrl */ |
258 | #define XGMAC_OMR_TTC_MASK 0x00030000 | 258 | #define XGMAC_OMR_TTC_MASK 0x00030000 |
259 | #define XGMAC_OMR_RFD 0x00006000 /* FC Deactivation Threshhold */ | 259 | #define XGMAC_OMR_RFD 0x00006000 /* FC Deactivation Threshold */ |
260 | #define XGMAC_OMR_RFD_MASK 0x00007000 /* FC Deact Threshhold MASK */ | 260 | #define XGMAC_OMR_RFD_MASK 0x00007000 /* FC Deact Threshold MASK */ |
261 | #define XGMAC_OMR_RFA 0x00000600 /* FC Activation Threshhold */ | 261 | #define XGMAC_OMR_RFA 0x00000600 /* FC Activation Threshold */ |
262 | #define XGMAC_OMR_RFA_MASK 0x00000E00 /* FC Act Threshhold MASK */ | 262 | #define XGMAC_OMR_RFA_MASK 0x00000E00 /* FC Act Threshold MASK */ |
263 | #define XGMAC_OMR_EFC 0x00000100 /* Enable Hardware FC */ | 263 | #define XGMAC_OMR_EFC 0x00000100 /* Enable Hardware FC */ |
264 | #define XGMAC_OMR_FEF 0x00000080 /* Forward Error Frames */ | 264 | #define XGMAC_OMR_FEF 0x00000080 /* Forward Error Frames */ |
265 | #define XGMAC_OMR_DT 0x00000040 /* Drop TCP/IP csum Errors */ | 265 | #define XGMAC_OMR_DT 0x00000040 /* Drop TCP/IP csum Errors */ |
266 | #define XGMAC_OMR_RSF 0x00000020 /* RX FIFO Store and Forward */ | 266 | #define XGMAC_OMR_RSF 0x00000020 /* RX FIFO Store and Forward */ |
267 | #define XGMAC_OMR_RTC_256 0x00000018 /* RX Threshhold Ctrl */ | 267 | #define XGMAC_OMR_RTC_256 0x00000018 /* RX Threshold Ctrl */ |
268 | #define XGMAC_OMR_RTC_MASK 0x00000018 /* RX Threshhold Ctrl MASK */ | 268 | #define XGMAC_OMR_RTC_MASK 0x00000018 /* RX Threshold Ctrl MASK */ |
269 | 269 | ||
270 | /* XGMAC HW Features Register */ | 270 | /* XGMAC HW Features Register */ |
271 | #define DMA_HW_FEAT_TXCOESEL 0x00010000 /* TX Checksum offload */ | 271 | #define DMA_HW_FEAT_TXCOESEL 0x00010000 /* TX Checksum offload */ |
diff --git a/drivers/net/ethernet/chelsio/cxgb3/t3_hw.c b/drivers/net/ethernet/chelsio/cxgb3/t3_hw.c index 184a8d545ac4..a22768c94200 100644 --- a/drivers/net/ethernet/chelsio/cxgb3/t3_hw.c +++ b/drivers/net/ethernet/chelsio/cxgb3/t3_hw.c | |||
@@ -840,7 +840,7 @@ static int flash_wait_op(struct adapter *adapter, int attempts, int delay) | |||
840 | * Read the specified number of 32-bit words from the serial flash. | 840 | * Read the specified number of 32-bit words from the serial flash. |
841 | * If @byte_oriented is set the read data is stored as a byte array | 841 | * If @byte_oriented is set the read data is stored as a byte array |
842 | * (i.e., big-endian), otherwise as 32-bit words in the platform's | 842 | * (i.e., big-endian), otherwise as 32-bit words in the platform's |
843 | * natural endianess. | 843 | * natural endianness. |
844 | */ | 844 | */ |
845 | static int t3_read_flash(struct adapter *adapter, unsigned int addr, | 845 | static int t3_read_flash(struct adapter *adapter, unsigned int addr, |
846 | unsigned int nwords, u32 *data, int byte_oriented) | 846 | unsigned int nwords, u32 *data, int byte_oriented) |
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c index e344bdcd40b3..4af8a9fd75ae 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | |||
@@ -5366,7 +5366,7 @@ static int adap_init0(struct adapter *adap) | |||
5366 | adap->tids.stid_base = val[1]; | 5366 | adap->tids.stid_base = val[1]; |
5367 | adap->tids.nstids = val[2] - val[1] + 1; | 5367 | adap->tids.nstids = val[2] - val[1] + 1; |
5368 | /* | 5368 | /* |
5369 | * Setup server filter region. Divide the availble filter | 5369 | * Setup server filter region. Divide the available filter |
5370 | * region into two parts. Regular filters get 1/3rd and server | 5370 | * region into two parts. Regular filters get 1/3rd and server |
5371 | * filters get 2/3rd part. This is only enabled if workarond | 5371 | * filters get 2/3rd part. This is only enabled if workarond |
5372 | * path is enabled. | 5372 | * path is enabled. |
diff --git a/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c index 853c38997c82..1498d078c319 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c +++ b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | |||
@@ -867,7 +867,7 @@ static int flash_wait_op(struct adapter *adapter, int attempts, int delay) | |||
867 | * Read the specified number of 32-bit words from the serial flash. | 867 | * Read the specified number of 32-bit words from the serial flash. |
868 | * If @byte_oriented is set the read data is stored as a byte array | 868 | * If @byte_oriented is set the read data is stored as a byte array |
869 | * (i.e., big-endian), otherwise as 32-bit words in the platform's | 869 | * (i.e., big-endian), otherwise as 32-bit words in the platform's |
870 | * natural endianess. | 870 | * natural endianness. |
871 | */ | 871 | */ |
872 | int t4_read_flash(struct adapter *adapter, unsigned int addr, | 872 | int t4_read_flash(struct adapter *adapter, unsigned int addr, |
873 | unsigned int nwords, u32 *data, int byte_oriented) | 873 | unsigned int nwords, u32 *data, int byte_oriented) |
@@ -3558,7 +3558,7 @@ int t4_fixup_host_params(struct adapter *adap, unsigned int page_size, | |||
3558 | * For the single-MTU buffers in unpacked mode we need to include | 3558 | * For the single-MTU buffers in unpacked mode we need to include |
3559 | * space for the SGE Control Packet Shift, 14 byte Ethernet header, | 3559 | * space for the SGE Control Packet Shift, 14 byte Ethernet header, |
3560 | * possible 4 byte VLAN tag, all rounded up to the next Ingress Packet | 3560 | * possible 4 byte VLAN tag, all rounded up to the next Ingress Packet |
3561 | * Padding boundry. All of these are accommodated in the Factory | 3561 | * Padding boundary. All of these are accommodated in the Factory |
3562 | * Default Firmware Configuration File but we need to adjust it for | 3562 | * Default Firmware Configuration File but we need to adjust it for |
3563 | * this host's cache line size. | 3563 | * this host's cache line size. |
3564 | */ | 3564 | */ |
@@ -4529,7 +4529,7 @@ int t4_init_tp_params(struct adapter *adap) | |||
4529 | PROTOCOL_F); | 4529 | PROTOCOL_F); |
4530 | 4530 | ||
4531 | /* If TP_INGRESS_CONFIG.VNID == 0, then TP_VLAN_PRI_MAP.VNIC_ID | 4531 | /* If TP_INGRESS_CONFIG.VNID == 0, then TP_VLAN_PRI_MAP.VNIC_ID |
4532 | * represents the presense of an Outer VLAN instead of a VNIC ID. | 4532 | * represents the presence of an Outer VLAN instead of a VNIC ID. |
4533 | */ | 4533 | */ |
4534 | if ((adap->params.tp.ingress_config & VNIC_F) == 0) | 4534 | if ((adap->params.tp.ingress_config & VNIC_F) == 0) |
4535 | adap->params.tp.vnic_shift = -1; | 4535 | adap->params.tp.vnic_shift = -1; |
diff --git a/drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h b/drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h index 9b353a88cbda..d136ca6a0c8a 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h +++ b/drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h | |||
@@ -36,7 +36,7 @@ | |||
36 | #define _T4FW_INTERFACE_H_ | 36 | #define _T4FW_INTERFACE_H_ |
37 | 37 | ||
38 | enum fw_retval { | 38 | enum fw_retval { |
39 | FW_SUCCESS = 0, /* completed sucessfully */ | 39 | FW_SUCCESS = 0, /* completed successfully */ |
40 | FW_EPERM = 1, /* operation not permitted */ | 40 | FW_EPERM = 1, /* operation not permitted */ |
41 | FW_ENOENT = 2, /* no such file or directory */ | 41 | FW_ENOENT = 2, /* no such file or directory */ |
42 | FW_EIO = 5, /* input/output error; hw bad */ | 42 | FW_EIO = 5, /* input/output error; hw bad */ |
diff --git a/drivers/net/ethernet/chelsio/cxgb4vf/sge.c b/drivers/net/ethernet/chelsio/cxgb4vf/sge.c index 0545f0de1c52..5ba14b32c370 100644 --- a/drivers/net/ethernet/chelsio/cxgb4vf/sge.c +++ b/drivers/net/ethernet/chelsio/cxgb4vf/sge.c | |||
@@ -875,7 +875,7 @@ static inline unsigned int calc_tx_flits(const struct sk_buff *skb) | |||
875 | * Write Header (incorporated as part of the cpl_tx_pkt_lso and | 875 | * Write Header (incorporated as part of the cpl_tx_pkt_lso and |
876 | * cpl_tx_pkt structures), followed by either a TX Packet Write CPL | 876 | * cpl_tx_pkt structures), followed by either a TX Packet Write CPL |
877 | * message or, if we're doing a Large Send Offload, an LSO CPL message | 877 | * message or, if we're doing a Large Send Offload, an LSO CPL message |
878 | * with an embeded TX Packet Write CPL message. | 878 | * with an embedded TX Packet Write CPL message. |
879 | */ | 879 | */ |
880 | flits = sgl_len(skb_shinfo(skb)->nr_frags + 1); | 880 | flits = sgl_len(skb_shinfo(skb)->nr_frags + 1); |
881 | if (skb_shinfo(skb)->gso_size) | 881 | if (skb_shinfo(skb)->gso_size) |
diff --git a/drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c b/drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c index 1b5506df35b1..c21e2e954ad8 100644 --- a/drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c +++ b/drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c | |||
@@ -339,7 +339,7 @@ int t4vf_port_init(struct adapter *adapter, int pidx) | |||
339 | * @adapter: the adapter | 339 | * @adapter: the adapter |
340 | * | 340 | * |
341 | * Issues a reset command to FW. For a Physical Function this would | 341 | * Issues a reset command to FW. For a Physical Function this would |
342 | * result in the Firmware reseting all of its state. For a Virtual | 342 | * result in the Firmware resetting all of its state. For a Virtual |
343 | * Function this just resets the state associated with the VF. | 343 | * Function this just resets the state associated with the VF. |
344 | */ | 344 | */ |
345 | int t4vf_fw_reset(struct adapter *adapter) | 345 | int t4vf_fw_reset(struct adapter *adapter) |
diff --git a/drivers/net/ethernet/cirrus/cs89x0.c b/drivers/net/ethernet/cirrus/cs89x0.c index d1c025fd9726..60383040d6c6 100644 --- a/drivers/net/ethernet/cirrus/cs89x0.c +++ b/drivers/net/ethernet/cirrus/cs89x0.c | |||
@@ -1578,7 +1578,7 @@ out1: | |||
1578 | 1578 | ||
1579 | #ifndef CONFIG_CS89x0_PLATFORM | 1579 | #ifndef CONFIG_CS89x0_PLATFORM |
1580 | /* | 1580 | /* |
1581 | * This function converts the I/O port addres used by the cs89x0_probe() and | 1581 | * This function converts the I/O port address used by the cs89x0_probe() and |
1582 | * init_module() functions to the I/O memory address used by the | 1582 | * init_module() functions to the I/O memory address used by the |
1583 | * cs89x0_probe1() function. | 1583 | * cs89x0_probe1() function. |
1584 | */ | 1584 | */ |
diff --git a/drivers/net/ethernet/dec/tulip/dmfe.c b/drivers/net/ethernet/dec/tulip/dmfe.c index 50a00777228e..afd8e78e024e 100644 --- a/drivers/net/ethernet/dec/tulip/dmfe.c +++ b/drivers/net/ethernet/dec/tulip/dmfe.c | |||
@@ -653,7 +653,7 @@ static void dmfe_init_dm910x(struct DEVICE *dev) | |||
653 | if ( !(db->media_mode & DMFE_AUTO) ) | 653 | if ( !(db->media_mode & DMFE_AUTO) ) |
654 | db->op_mode = db->media_mode; /* Force Mode */ | 654 | db->op_mode = db->media_mode; /* Force Mode */ |
655 | 655 | ||
656 | /* Initialize Transmit/Receive decriptor and CR3/4 */ | 656 | /* Initialize Transmit/Receive descriptor and CR3/4 */ |
657 | dmfe_descriptor_init(dev); | 657 | dmfe_descriptor_init(dev); |
658 | 658 | ||
659 | /* Init CR6 to program DM910x operation */ | 659 | /* Init CR6 to program DM910x operation */ |
diff --git a/drivers/net/ethernet/dec/tulip/uli526x.c b/drivers/net/ethernet/dec/tulip/uli526x.c index 1c5916b13778..2c30c0c83f98 100644 --- a/drivers/net/ethernet/dec/tulip/uli526x.c +++ b/drivers/net/ethernet/dec/tulip/uli526x.c | |||
@@ -564,7 +564,7 @@ static void uli526x_init(struct net_device *dev) | |||
564 | if ( !(db->media_mode & ULI526X_AUTO) ) | 564 | if ( !(db->media_mode & ULI526X_AUTO) ) |
565 | db->op_mode = db->media_mode; /* Force Mode */ | 565 | db->op_mode = db->media_mode; /* Force Mode */ |
566 | 566 | ||
567 | /* Initialize Transmit/Receive decriptor and CR3/4 */ | 567 | /* Initialize Transmit/Receive descriptor and CR3/4 */ |
568 | uli526x_descriptor_init(dev, ioaddr); | 568 | uli526x_descriptor_init(dev, ioaddr); |
569 | 569 | ||
570 | /* Init CR6 to program M526X operation */ | 570 | /* Init CR6 to program M526X operation */ |
diff --git a/drivers/net/ethernet/emulex/benet/be_cmds.c b/drivers/net/ethernet/emulex/benet/be_cmds.c index 75cb4610423b..dc278391a391 100644 --- a/drivers/net/ethernet/emulex/benet/be_cmds.c +++ b/drivers/net/ethernet/emulex/benet/be_cmds.c | |||
@@ -3021,7 +3021,7 @@ int be_cmd_get_mac_from_list(struct be_adapter *adapter, u8 *mac, | |||
3021 | 3021 | ||
3022 | mac_count = resp->true_mac_count + resp->pseudo_mac_count; | 3022 | mac_count = resp->true_mac_count + resp->pseudo_mac_count; |
3023 | /* Mac list returned could contain one or more active mac_ids | 3023 | /* Mac list returned could contain one or more active mac_ids |
3024 | * or one or more true or pseudo permanant mac addresses. | 3024 | * or one or more true or pseudo permanent mac addresses. |
3025 | * If an active mac_id is present, return first active mac_id | 3025 | * If an active mac_id is present, return first active mac_id |
3026 | * found. | 3026 | * found. |
3027 | */ | 3027 | */ |
diff --git a/drivers/net/ethernet/freescale/fec_ptp.c b/drivers/net/ethernet/freescale/fec_ptp.c index 1f9cf2345266..4585895ddc9a 100644 --- a/drivers/net/ethernet/freescale/fec_ptp.c +++ b/drivers/net/ethernet/freescale/fec_ptp.c | |||
@@ -136,7 +136,7 @@ static int fec_ptp_enable_pps(struct fec_enet_private *fep, uint enable) | |||
136 | */ | 136 | */ |
137 | writel(FEC_T_TF_MASK, fep->hwp + FEC_TCSR(fep->pps_channel)); | 137 | writel(FEC_T_TF_MASK, fep->hwp + FEC_TCSR(fep->pps_channel)); |
138 | 138 | ||
139 | /* It is recommended to doulbe check the TMODE field in the | 139 | /* It is recommended to double check the TMODE field in the |
140 | * TCSR register to be cleared before the first compare counter | 140 | * TCSR register to be cleared before the first compare counter |
141 | * is written into TCCR register. Just add a double check. | 141 | * is written into TCCR register. Just add a double check. |
142 | */ | 142 | */ |
diff --git a/drivers/net/ethernet/intel/e100.c b/drivers/net/ethernet/intel/e100.c index e9c3a87e5b11..05f88394f9a5 100644 --- a/drivers/net/ethernet/intel/e100.c +++ b/drivers/net/ethernet/intel/e100.c | |||
@@ -414,7 +414,7 @@ enum cb_status { | |||
414 | 414 | ||
415 | /** | 415 | /** |
416 | * cb_command - Command Block flags | 416 | * cb_command - Command Block flags |
417 | * @cb_tx_nc: 0: controler does CRC (normal), 1: CRC from skb memory | 417 | * @cb_tx_nc: 0: controller does CRC (normal), 1: CRC from skb memory |
418 | */ | 418 | */ |
419 | enum cb_command { | 419 | enum cb_command { |
420 | cb_nop = 0x0000, | 420 | cb_nop = 0x0000, |
diff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c index 73c98d34fa1f..b548ef0cf56b 100644 --- a/drivers/net/ethernet/intel/e1000/e1000_main.c +++ b/drivers/net/ethernet/intel/e1000/e1000_main.c | |||
@@ -1116,7 +1116,7 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
1116 | if (e1000_read_mac_addr(hw)) | 1116 | if (e1000_read_mac_addr(hw)) |
1117 | e_err(probe, "EEPROM Read Error\n"); | 1117 | e_err(probe, "EEPROM Read Error\n"); |
1118 | } | 1118 | } |
1119 | /* don't block initalization here due to bad MAC address */ | 1119 | /* don't block initialization here due to bad MAC address */ |
1120 | memcpy(netdev->dev_addr, hw->mac_addr, netdev->addr_len); | 1120 | memcpy(netdev->dev_addr, hw->mac_addr, netdev->addr_len); |
1121 | 1121 | ||
1122 | if (!is_valid_ether_addr(netdev->dev_addr)) | 1122 | if (!is_valid_ether_addr(netdev->dev_addr)) |
diff --git a/drivers/net/ethernet/intel/i40evf/i40evf_main.c b/drivers/net/ethernet/intel/i40evf/i40evf_main.c index 8537416123a5..f44911df286a 100644 --- a/drivers/net/ethernet/intel/i40evf/i40evf_main.c +++ b/drivers/net/ethernet/intel/i40evf/i40evf_main.c | |||
@@ -2009,7 +2009,7 @@ static int i40evf_check_reset_complete(struct i40e_hw *hw) | |||
2009 | * | 2009 | * |
2010 | * This task completes the work that was begun in probe. Due to the nature | 2010 | * This task completes the work that was begun in probe. Due to the nature |
2011 | * of VF-PF communications, we may need to wait tens of milliseconds to get | 2011 | * of VF-PF communications, we may need to wait tens of milliseconds to get |
2012 | * reponses back from the PF. Rather than busy-wait in probe and bog down the | 2012 | * responses back from the PF. Rather than busy-wait in probe and bog down the |
2013 | * whole system, we'll do it in a task so we can sleep. | 2013 | * whole system, we'll do it in a task so we can sleep. |
2014 | * This task only runs during driver init. Once we've established | 2014 | * This task only runs during driver init. Once we've established |
2015 | * communications with the PF driver and set up our netdev, the watchdog | 2015 | * communications with the PF driver and set up our netdev, the watchdog |
@@ -2400,7 +2400,7 @@ static int i40evf_suspend(struct pci_dev *pdev, pm_message_t state) | |||
2400 | } | 2400 | } |
2401 | 2401 | ||
2402 | /** | 2402 | /** |
2403 | * i40evf_resume - Power managment resume routine | 2403 | * i40evf_resume - Power management resume routine |
2404 | * @pdev: PCI device information struct | 2404 | * @pdev: PCI device information struct |
2405 | * | 2405 | * |
2406 | * Called when the system (VM) is resumed from sleep/suspend. | 2406 | * Called when the system (VM) is resumed from sleep/suspend. |
diff --git a/drivers/net/ethernet/intel/igb/igb_ptp.c b/drivers/net/ethernet/intel/igb/igb_ptp.c index d6be4c69172d..52d01b8b01ed 100644 --- a/drivers/net/ethernet/intel/igb/igb_ptp.c +++ b/drivers/net/ethernet/intel/igb/igb_ptp.c | |||
@@ -30,7 +30,7 @@ | |||
30 | * | 30 | * |
31 | * Neither the 82576 nor the 82580 offer registers wide enough to hold | 31 | * Neither the 82576 nor the 82580 offer registers wide enough to hold |
32 | * nanoseconds time values for very long. For the 82580, SYSTIM always | 32 | * nanoseconds time values for very long. For the 82580, SYSTIM always |
33 | * counts nanoseconds, but the upper 24 bits are not availible. The | 33 | * counts nanoseconds, but the upper 24 bits are not available. The |
34 | * frequency is adjusted by changing the 32 bit fractional nanoseconds | 34 | * frequency is adjusted by changing the 32 bit fractional nanoseconds |
35 | * register, TIMINCA. | 35 | * register, TIMINCA. |
36 | * | 36 | * |
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c index 903664ff6904..21aea7e7f03f 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | |||
@@ -2609,7 +2609,7 @@ static irqreturn_t ixgbe_msix_other(int irq, void *data) | |||
2609 | eicr = IXGBE_READ_REG(hw, IXGBE_EICS); | 2609 | eicr = IXGBE_READ_REG(hw, IXGBE_EICS); |
2610 | 2610 | ||
2611 | /* The lower 16bits of the EICR register are for the queue interrupts | 2611 | /* The lower 16bits of the EICR register are for the queue interrupts |
2612 | * which should be masked here in order to not accidently clear them if | 2612 | * which should be masked here in order to not accidentally clear them if |
2613 | * the bits are high when ixgbe_msix_other is called. There is a race | 2613 | * the bits are high when ixgbe_msix_other is called. There is a race |
2614 | * condition otherwise which results in possible performance loss | 2614 | * condition otherwise which results in possible performance loss |
2615 | * especially if the ixgbe_msix_other interrupt is triggering | 2615 | * especially if the ixgbe_msix_other interrupt is triggering |
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c index 79c00f57d3e7..bd46f5d1c943 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c | |||
@@ -488,7 +488,7 @@ static void ixgbe_ptp_tx_hwtstamp(struct ixgbe_adapter *adapter) | |||
488 | * @work: pointer to the work struct | 488 | * @work: pointer to the work struct |
489 | * | 489 | * |
490 | * This work item polls TSYNCTXCTL valid bit to determine when a Tx hardware | 490 | * This work item polls TSYNCTXCTL valid bit to determine when a Tx hardware |
491 | * timestamp has been taken for the current skb. It is necesary, because the | 491 | * timestamp has been taken for the current skb. It is necessary, because the |
492 | * descriptor's "done" bit does not correlate with the timestamp event. | 492 | * descriptor's "done" bit does not correlate with the timestamp event. |
493 | */ | 493 | */ |
494 | static void ixgbe_ptp_tx_hwtstamp_work(struct work_struct *work) | 494 | static void ixgbe_ptp_tx_hwtstamp_work(struct work_struct *work) |
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c index 7f37fe7269a7..09a291bb7c34 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | |||
@@ -141,7 +141,7 @@ void ixgbe_enable_sriov(struct ixgbe_adapter *adapter) | |||
141 | * The 82599 supports up to 64 VFs per physical function | 141 | * The 82599 supports up to 64 VFs per physical function |
142 | * but this implementation limits allocation to 63 so that | 142 | * but this implementation limits allocation to 63 so that |
143 | * basic networking resources are still available to the | 143 | * basic networking resources are still available to the |
144 | * physical function. If the user requests greater thn | 144 | * physical function. If the user requests greater than |
145 | * 63 VFs then it is an error - reset to default of zero. | 145 | * 63 VFs then it is an error - reset to default of zero. |
146 | */ | 146 | */ |
147 | adapter->num_vfs = min_t(unsigned int, adapter->num_vfs, IXGBE_MAX_VFS_DRV_LIMIT); | 147 | adapter->num_vfs = min_t(unsigned int, adapter->num_vfs, IXGBE_MAX_VFS_DRV_LIMIT); |
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h index fc5ecee56ca8..8451f9a7cbd8 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | |||
@@ -1690,7 +1690,7 @@ enum { | |||
1690 | #define IXGBE_MACC_FS 0x00040000 | 1690 | #define IXGBE_MACC_FS 0x00040000 |
1691 | #define IXGBE_MAC_RX2TX_LPBK 0x00000002 | 1691 | #define IXGBE_MAC_RX2TX_LPBK 0x00000002 |
1692 | 1692 | ||
1693 | /* Veto Bit definiton */ | 1693 | /* Veto Bit definition */ |
1694 | #define IXGBE_MMNGC_MNG_VETO 0x00000001 | 1694 | #define IXGBE_MMNGC_MNG_VETO 0x00000001 |
1695 | 1695 | ||
1696 | /* LINKS Bit Masks */ | 1696 | /* LINKS Bit Masks */ |
diff --git a/drivers/net/ethernet/intel/ixgbevf/vf.c b/drivers/net/ethernet/intel/ixgbevf/vf.c index cdb53be7d995..f510a5822f90 100644 --- a/drivers/net/ethernet/intel/ixgbevf/vf.c +++ b/drivers/net/ethernet/intel/ixgbevf/vf.c | |||
@@ -65,7 +65,7 @@ static s32 ixgbevf_init_hw_vf(struct ixgbe_hw *hw) | |||
65 | * ixgbevf_reset_hw_vf - Performs hardware reset | 65 | * ixgbevf_reset_hw_vf - Performs hardware reset |
66 | * @hw: pointer to hardware structure | 66 | * @hw: pointer to hardware structure |
67 | * | 67 | * |
68 | * Resets the hardware by reseting the transmit and receive units, masks and | 68 | * Resets the hardware by resetting the transmit and receive units, masks and |
69 | * clears all interrupts. | 69 | * clears all interrupts. |
70 | **/ | 70 | **/ |
71 | static s32 ixgbevf_reset_hw_vf(struct ixgbe_hw *hw) | 71 | static s32 ixgbevf_reset_hw_vf(struct ixgbe_hw *hw) |
diff --git a/drivers/net/ethernet/marvell/mvpp2.c b/drivers/net/ethernet/marvell/mvpp2.c index fdf3e382e464..3e8b1bfb1f2e 100644 --- a/drivers/net/ethernet/marvell/mvpp2.c +++ b/drivers/net/ethernet/marvell/mvpp2.c | |||
@@ -1423,7 +1423,7 @@ static void mvpp2_prs_mac_promisc_set(struct mvpp2 *priv, int port, bool add) | |||
1423 | { | 1423 | { |
1424 | struct mvpp2_prs_entry pe; | 1424 | struct mvpp2_prs_entry pe; |
1425 | 1425 | ||
1426 | /* Promiscous mode - Accept unknown packets */ | 1426 | /* Promiscuous mode - Accept unknown packets */ |
1427 | 1427 | ||
1428 | if (priv->prs_shadow[MVPP2_PE_MAC_PROMISCUOUS].valid) { | 1428 | if (priv->prs_shadow[MVPP2_PE_MAC_PROMISCUOUS].valid) { |
1429 | /* Entry exist - update port only */ | 1429 | /* Entry exist - update port only */ |
@@ -3402,7 +3402,7 @@ static void mvpp2_bm_bufs_free(struct mvpp2 *priv, struct mvpp2_bm_pool *bm_pool | |||
3402 | for (i = 0; i < bm_pool->buf_num; i++) { | 3402 | for (i = 0; i < bm_pool->buf_num; i++) { |
3403 | u32 vaddr; | 3403 | u32 vaddr; |
3404 | 3404 | ||
3405 | /* Get buffer virtual adress (indirect access) */ | 3405 | /* Get buffer virtual address (indirect access) */ |
3406 | mvpp2_read(priv, MVPP2_BM_PHY_ALLOC_REG(bm_pool->id)); | 3406 | mvpp2_read(priv, MVPP2_BM_PHY_ALLOC_REG(bm_pool->id)); |
3407 | vaddr = mvpp2_read(priv, MVPP2_BM_VIRT_ALLOC_REG); | 3407 | vaddr = mvpp2_read(priv, MVPP2_BM_VIRT_ALLOC_REG); |
3408 | if (!vaddr) | 3408 | if (!vaddr) |
diff --git a/drivers/net/ethernet/mellanox/mlx4/mlx4.h b/drivers/net/ethernet/mellanox/mlx4/mlx4.h index 1409d0cd6143..0b16db015745 100644 --- a/drivers/net/ethernet/mellanox/mlx4/mlx4.h +++ b/drivers/net/ethernet/mellanox/mlx4/mlx4.h | |||
@@ -175,7 +175,7 @@ enum mlx4_res_tracker_free_type { | |||
175 | 175 | ||
176 | /* | 176 | /* |
177 | *Virtual HCR structures. | 177 | *Virtual HCR structures. |
178 | * mlx4_vhcr is the sw representation, in machine endianess | 178 | * mlx4_vhcr is the sw representation, in machine endianness |
179 | * | 179 | * |
180 | * mlx4_vhcr_cmd is the formalized structure, the one that is passed | 180 | * mlx4_vhcr_cmd is the formalized structure, the one that is passed |
181 | * to FW to go through communication channel. | 181 | * to FW to go through communication channel. |
diff --git a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c index d97ca88c55b5..d43e25914d19 100644 --- a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c +++ b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c | |||
@@ -3027,7 +3027,7 @@ int mlx4_WRITE_MTT_wrapper(struct mlx4_dev *dev, int slave, | |||
3027 | 3027 | ||
3028 | /* Call the SW implementation of write_mtt: | 3028 | /* Call the SW implementation of write_mtt: |
3029 | * - Prepare a dummy mtt struct | 3029 | * - Prepare a dummy mtt struct |
3030 | * - Translate inbox contents to simple addresses in host endianess */ | 3030 | * - Translate inbox contents to simple addresses in host endianness */ |
3031 | mtt.offset = 0; /* TBD this is broken but I don't handle it since | 3031 | mtt.offset = 0; /* TBD this is broken but I don't handle it since |
3032 | we don't really use it */ | 3032 | we don't really use it */ |
3033 | mtt.order = 0; | 3033 | mtt.order = 0; |
diff --git a/drivers/net/ethernet/moxa/moxart_ether.c b/drivers/net/ethernet/moxa/moxart_ether.c index 6c72e74fef3e..81d0f1c86d6d 100644 --- a/drivers/net/ethernet/moxa/moxart_ether.c +++ b/drivers/net/ethernet/moxa/moxart_ether.c | |||
@@ -150,7 +150,7 @@ static void moxart_mac_setup_desc_ring(struct net_device *ndev) | |||
150 | 150 | ||
151 | priv->rx_head = 0; | 151 | priv->rx_head = 0; |
152 | 152 | ||
153 | /* reset the MAC controler TX/RX desciptor base address */ | 153 | /* reset the MAC controller TX/RX desciptor base address */ |
154 | writel(priv->tx_base, priv->base + REG_TXR_BASE_ADDRESS); | 154 | writel(priv->tx_base, priv->base + REG_TXR_BASE_ADDRESS); |
155 | writel(priv->rx_base, priv->base + REG_RXR_BASE_ADDRESS); | 155 | writel(priv->rx_base, priv->base + REG_RXR_BASE_ADDRESS); |
156 | } | 156 | } |
diff --git a/drivers/net/ethernet/neterion/s2io.c b/drivers/net/ethernet/neterion/s2io.c index a4cdf2f8041a..092dcae0d4a9 100644 --- a/drivers/net/ethernet/neterion/s2io.c +++ b/drivers/net/ethernet/neterion/s2io.c | |||
@@ -1343,7 +1343,7 @@ static int init_nic(struct s2io_nic *nic) | |||
1343 | TX_PA_CFG_IGNORE_L2_ERR; | 1343 | TX_PA_CFG_IGNORE_L2_ERR; |
1344 | writeq(val64, &bar0->tx_pa_cfg); | 1344 | writeq(val64, &bar0->tx_pa_cfg); |
1345 | 1345 | ||
1346 | /* Rx DMA intialization. */ | 1346 | /* Rx DMA initialization. */ |
1347 | val64 = 0; | 1347 | val64 = 0; |
1348 | for (i = 0; i < config->rx_ring_num; i++) { | 1348 | for (i = 0; i < config->rx_ring_num; i++) { |
1349 | struct rx_ring_config *rx_cfg = &config->rx_cfg[i]; | 1349 | struct rx_ring_config *rx_cfg = &config->rx_cfg[i]; |
diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c index 4fe8ea96bd25..f6fcf7450352 100644 --- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c +++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c | |||
@@ -394,7 +394,7 @@ static void pch_gbe_get_pauseparam(struct net_device *netdev, | |||
394 | } | 394 | } |
395 | 395 | ||
396 | /** | 396 | /** |
397 | * pch_gbe_set_pauseparam - Set pause paramters | 397 | * pch_gbe_set_pauseparam - Set pause parameters |
398 | * @netdev: Network interface device structure | 398 | * @netdev: Network interface device structure |
399 | * @pause: Pause parameters structure | 399 | * @pause: Pause parameters structure |
400 | * Returns: | 400 | * Returns: |
diff --git a/drivers/net/ethernet/packetengines/hamachi.c b/drivers/net/ethernet/packetengines/hamachi.c index 319d9d40f922..13d88a6025c8 100644 --- a/drivers/net/ethernet/packetengines/hamachi.c +++ b/drivers/net/ethernet/packetengines/hamachi.c | |||
@@ -350,7 +350,7 @@ V. Recent Changes | |||
350 | incorrectly defined and corrected (as per Michel Mueller). | 350 | incorrectly defined and corrected (as per Michel Mueller). |
351 | 351 | ||
352 | 02/23/1999 EPK Corrected the Tx full check to check that at least 4 slots | 352 | 02/23/1999 EPK Corrected the Tx full check to check that at least 4 slots |
353 | were available before reseting the tbusy and tx_full flags | 353 | were available before resetting the tbusy and tx_full flags |
354 | (as per Michel Mueller). | 354 | (as per Michel Mueller). |
355 | 355 | ||
356 | 03/11/1999 EPK Added Pete Wyckoff's hardware checksumming support. | 356 | 03/11/1999 EPK Added Pete Wyckoff's hardware checksumming support. |
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h index f3346a3779d3..69f828eb42cf 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h | |||
@@ -205,7 +205,7 @@ struct qlcnic_add_rings_mbx_out { | |||
205 | * @phys_addr_{low|high}: DMA address of the transmit buffer | 205 | * @phys_addr_{low|high}: DMA address of the transmit buffer |
206 | * @cnsmr_index_{low|high}: host consumer index | 206 | * @cnsmr_index_{low|high}: host consumer index |
207 | * @size: legth of transmit buffer ring | 207 | * @size: legth of transmit buffer ring |
208 | * @intr_id: interrput id | 208 | * @intr_id: interrupt id |
209 | * @src: src of interrupt | 209 | * @src: src of interrupt |
210 | */ | 210 | */ |
211 | struct qlcnic_tx_mbx { | 211 | struct qlcnic_tx_mbx { |
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c index 2bb48d57e7a5..33669c29b341 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c | |||
@@ -269,7 +269,7 @@ static int qlcnic_83xx_idc_clear_registers(struct qlcnic_adapter *adapter, | |||
269 | } | 269 | } |
270 | 270 | ||
271 | QLCWRX(adapter->ahw, QLC_83XX_IDC_DRV_ACK, 0); | 271 | QLCWRX(adapter->ahw, QLC_83XX_IDC_DRV_ACK, 0); |
272 | /* Clear gracefull reset bit */ | 272 | /* Clear graceful reset bit */ |
273 | val = QLCRDX(adapter->ahw, QLC_83XX_IDC_CTRL); | 273 | val = QLCRDX(adapter->ahw, QLC_83XX_IDC_CTRL); |
274 | val &= ~QLC_83XX_IDC_GRACEFULL_RESET; | 274 | val &= ~QLC_83XX_IDC_GRACEFULL_RESET; |
275 | QLCWRX(adapter->ahw, QLC_83XX_IDC_CTRL, val); | 275 | QLCWRX(adapter->ahw, QLC_83XX_IDC_CTRL, val); |
@@ -889,7 +889,7 @@ static int qlcnic_83xx_idc_ready_state(struct qlcnic_adapter *adapter) | |||
889 | * @adapter: adapter structure | 889 | * @adapter: adapter structure |
890 | * | 890 | * |
891 | * Device will remain in this state until: | 891 | * Device will remain in this state until: |
892 | * Reset request ACK's are recieved from all the functions | 892 | * Reset request ACK's are received from all the functions |
893 | * Wait time exceeds max time limit | 893 | * Wait time exceeds max time limit |
894 | * | 894 | * |
895 | * Returns: Error code or Success(0) | 895 | * Returns: Error code or Success(0) |
diff --git a/drivers/net/ethernet/qualcomm/qca_spi.c b/drivers/net/ethernet/qualcomm/qca_spi.c index 2c811f66d5ac..4a42e960d331 100644 --- a/drivers/net/ethernet/qualcomm/qca_spi.c +++ b/drivers/net/ethernet/qualcomm/qca_spi.c | |||
@@ -571,7 +571,7 @@ qcaspi_spi_thread(void *data) | |||
571 | } | 571 | } |
572 | 572 | ||
573 | /* can only handle other interrupts | 573 | /* can only handle other interrupts |
574 | * if sync has occured | 574 | * if sync has occurred |
575 | */ | 575 | */ |
576 | if (qca->sync == QCASPI_SYNC_READY) { | 576 | if (qca->sync == QCASPI_SYNC_READY) { |
577 | if (intr_cause & SPI_INT_PKT_AVLBL) | 577 | if (intr_cause & SPI_INT_PKT_AVLBL) |
diff --git a/drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c b/drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c index c8a01ee4d25e..413ea14ab91f 100644 --- a/drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c +++ b/drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c | |||
@@ -422,11 +422,11 @@ static int init_tx_ring(struct device *dev, u8 queue_no, | |||
422 | /* assign queue number */ | 422 | /* assign queue number */ |
423 | tx_ring->queue_no = queue_no; | 423 | tx_ring->queue_no = queue_no; |
424 | 424 | ||
425 | /* initalise counters */ | 425 | /* initialise counters */ |
426 | tx_ring->dirty_tx = 0; | 426 | tx_ring->dirty_tx = 0; |
427 | tx_ring->cur_tx = 0; | 427 | tx_ring->cur_tx = 0; |
428 | 428 | ||
429 | /* initalise TX queue lock */ | 429 | /* initialise TX queue lock */ |
430 | spin_lock_init(&tx_ring->tx_lock); | 430 | spin_lock_init(&tx_ring->tx_lock); |
431 | 431 | ||
432 | return 0; | 432 | return 0; |
@@ -515,7 +515,7 @@ static int init_rx_ring(struct net_device *dev, u8 queue_no, | |||
515 | goto err_free_rx_buffers; | 515 | goto err_free_rx_buffers; |
516 | } | 516 | } |
517 | 517 | ||
518 | /* initalise counters */ | 518 | /* initialise counters */ |
519 | rx_ring->cur_rx = 0; | 519 | rx_ring->cur_rx = 0; |
520 | rx_ring->dirty_rx = (unsigned int)(desc_index - rx_rsize); | 520 | rx_ring->dirty_rx = (unsigned int)(desc_index - rx_rsize); |
521 | priv->dma_buf_sz = bfsize; | 521 | priv->dma_buf_sz = bfsize; |
@@ -837,7 +837,7 @@ static void sxgbe_restart_tx_queue(struct sxgbe_priv_data *priv, int queue_num) | |||
837 | /* free the skbuffs of the ring */ | 837 | /* free the skbuffs of the ring */ |
838 | tx_free_ring_skbufs(tx_ring); | 838 | tx_free_ring_skbufs(tx_ring); |
839 | 839 | ||
840 | /* initalise counters */ | 840 | /* initialise counters */ |
841 | tx_ring->cur_tx = 0; | 841 | tx_ring->cur_tx = 0; |
842 | tx_ring->dirty_tx = 0; | 842 | tx_ring->dirty_tx = 0; |
843 | 843 | ||
@@ -1176,7 +1176,7 @@ static int sxgbe_open(struct net_device *dev) | |||
1176 | if (priv->phydev) | 1176 | if (priv->phydev) |
1177 | phy_start(priv->phydev); | 1177 | phy_start(priv->phydev); |
1178 | 1178 | ||
1179 | /* initalise TX coalesce parameters */ | 1179 | /* initialise TX coalesce parameters */ |
1180 | sxgbe_tx_init_coalesce(priv); | 1180 | sxgbe_tx_init_coalesce(priv); |
1181 | 1181 | ||
1182 | if ((priv->use_riwt) && (priv->hw->dma->rx_watchdog)) { | 1182 | if ((priv->use_riwt) && (priv->hw->dma->rx_watchdog)) { |
@@ -1721,7 +1721,7 @@ static inline u64 sxgbe_get_stat64(void __iomem *ioaddr, int reg_lo, int reg_hi) | |||
1721 | * Description: | 1721 | * Description: |
1722 | * This function is a driver entry point whenever ifconfig command gets | 1722 | * This function is a driver entry point whenever ifconfig command gets |
1723 | * executed to see device statistics. Statistics are number of | 1723 | * executed to see device statistics. Statistics are number of |
1724 | * bytes sent or received, errors occured etc. | 1724 | * bytes sent or received, errors occurred etc. |
1725 | * Return value: | 1725 | * Return value: |
1726 | * This function returns various statistical information of device. | 1726 | * This function returns various statistical information of device. |
1727 | */ | 1727 | */ |
diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c index 238482495e81..33d2f9aa1b53 100644 --- a/drivers/net/ethernet/sfc/efx.c +++ b/drivers/net/ethernet/sfc/efx.c | |||
@@ -3215,7 +3215,7 @@ static pci_ers_result_t efx_io_error_detected(struct pci_dev *pdev, | |||
3215 | return status; | 3215 | return status; |
3216 | } | 3216 | } |
3217 | 3217 | ||
3218 | /* Fake a successfull reset, which will be performed later in efx_io_resume. */ | 3218 | /* Fake a successful reset, which will be performed later in efx_io_resume. */ |
3219 | static pci_ers_result_t efx_io_slot_reset(struct pci_dev *pdev) | 3219 | static pci_ers_result_t efx_io_slot_reset(struct pci_dev *pdev) |
3220 | { | 3220 | { |
3221 | struct efx_nic *efx = pci_get_drvdata(pdev); | 3221 | struct efx_nic *efx = pci_get_drvdata(pdev); |
diff --git a/drivers/net/ethernet/sfc/farch.c b/drivers/net/ethernet/sfc/farch.c index 75975328e020..bb89e96a125e 100644 --- a/drivers/net/ethernet/sfc/farch.c +++ b/drivers/net/ethernet/sfc/farch.c | |||
@@ -645,7 +645,7 @@ static bool efx_check_tx_flush_complete(struct efx_nic *efx) | |||
645 | } | 645 | } |
646 | 646 | ||
647 | /* Flush all the transmit queues, and continue flushing receive queues until | 647 | /* Flush all the transmit queues, and continue flushing receive queues until |
648 | * they're all flushed. Wait for the DRAIN events to be recieved so that there | 648 | * they're all flushed. Wait for the DRAIN events to be received so that there |
649 | * are no more RX and TX events left on any channel. */ | 649 | * are no more RX and TX events left on any channel. */ |
650 | static int efx_farch_do_flush(struct efx_nic *efx) | 650 | static int efx_farch_do_flush(struct efx_nic *efx) |
651 | { | 651 | { |
@@ -1108,7 +1108,7 @@ efx_farch_handle_tx_flush_done(struct efx_nic *efx, efx_qword_t *event) | |||
1108 | } | 1108 | } |
1109 | 1109 | ||
1110 | /* If this flush done event corresponds to a &struct efx_rx_queue: If the flush | 1110 | /* If this flush done event corresponds to a &struct efx_rx_queue: If the flush |
1111 | * was succesful then send an %EFX_CHANNEL_MAGIC_RX_DRAIN, otherwise add | 1111 | * was successful then send an %EFX_CHANNEL_MAGIC_RX_DRAIN, otherwise add |
1112 | * the RX queue back to the mask of RX queues in need of flushing. | 1112 | * the RX queue back to the mask of RX queues in need of flushing. |
1113 | */ | 1113 | */ |
1114 | static void | 1114 | static void |
diff --git a/drivers/net/ethernet/sfc/mcdi_pcol.h b/drivers/net/ethernet/sfc/mcdi_pcol.h index a707fb5ef14c..e028de10e1b7 100644 --- a/drivers/net/ethernet/sfc/mcdi_pcol.h +++ b/drivers/net/ethernet/sfc/mcdi_pcol.h | |||
@@ -6497,7 +6497,7 @@ | |||
6497 | #define MC_CMD_DUMP_BUFTBL_ENTRIES_OUT_LENMIN 12 | 6497 | #define MC_CMD_DUMP_BUFTBL_ENTRIES_OUT_LENMIN 12 |
6498 | #define MC_CMD_DUMP_BUFTBL_ENTRIES_OUT_LENMAX 252 | 6498 | #define MC_CMD_DUMP_BUFTBL_ENTRIES_OUT_LENMAX 252 |
6499 | #define MC_CMD_DUMP_BUFTBL_ENTRIES_OUT_LEN(num) (0+12*(num)) | 6499 | #define MC_CMD_DUMP_BUFTBL_ENTRIES_OUT_LEN(num) (0+12*(num)) |
6500 | /* Raw buffer table entries, layed out as BUFTBL_ENTRY. */ | 6500 | /* Raw buffer table entries, laid out as BUFTBL_ENTRY. */ |
6501 | #define MC_CMD_DUMP_BUFTBL_ENTRIES_OUT_ENTRY_OFST 0 | 6501 | #define MC_CMD_DUMP_BUFTBL_ENTRIES_OUT_ENTRY_OFST 0 |
6502 | #define MC_CMD_DUMP_BUFTBL_ENTRIES_OUT_ENTRY_LEN 12 | 6502 | #define MC_CMD_DUMP_BUFTBL_ENTRIES_OUT_ENTRY_LEN 12 |
6503 | #define MC_CMD_DUMP_BUFTBL_ENTRIES_OUT_ENTRY_MINNUM 1 | 6503 | #define MC_CMD_DUMP_BUFTBL_ENTRIES_OUT_ENTRY_MINNUM 1 |
diff --git a/drivers/net/ethernet/sfc/siena_sriov.c b/drivers/net/ethernet/sfc/siena_sriov.c index a8bbbad68a88..fe83430796fd 100644 --- a/drivers/net/ethernet/sfc/siena_sriov.c +++ b/drivers/net/ethernet/sfc/siena_sriov.c | |||
@@ -1067,7 +1067,7 @@ void efx_siena_sriov_probe(struct efx_nic *efx) | |||
1067 | } | 1067 | } |
1068 | 1068 | ||
1069 | /* Copy the list of individual addresses into the vfdi_status.peers | 1069 | /* Copy the list of individual addresses into the vfdi_status.peers |
1070 | * array and auxillary pages, protected by %local_lock. Drop that lock | 1070 | * array and auxiliary pages, protected by %local_lock. Drop that lock |
1071 | * and then broadcast the address list to every VF. | 1071 | * and then broadcast the address list to every VF. |
1072 | */ | 1072 | */ |
1073 | static void efx_siena_sriov_peer_work(struct work_struct *data) | 1073 | static void efx_siena_sriov_peer_work(struct work_struct *data) |
diff --git a/drivers/net/ethernet/sfc/vfdi.h b/drivers/net/ethernet/sfc/vfdi.h index ae044f44936a..f62901d4cae0 100644 --- a/drivers/net/ethernet/sfc/vfdi.h +++ b/drivers/net/ethernet/sfc/vfdi.h | |||
@@ -98,7 +98,7 @@ struct vfdi_endpoint { | |||
98 | * @VFDI_OP_INIT_TXQ: Initialize SRAM entries and initialize a TXQ. | 98 | * @VFDI_OP_INIT_TXQ: Initialize SRAM entries and initialize a TXQ. |
99 | * @VFDI_OP_FINI_ALL_QUEUES: Flush all queues, finalize all queues, then | 99 | * @VFDI_OP_FINI_ALL_QUEUES: Flush all queues, finalize all queues, then |
100 | * finalize the SRAM entries. | 100 | * finalize the SRAM entries. |
101 | * @VFDI_OP_INSERT_FILTER: Insert a MAC filter targetting the given RXQ. | 101 | * @VFDI_OP_INSERT_FILTER: Insert a MAC filter targeting the given RXQ. |
102 | * @VFDI_OP_REMOVE_ALL_FILTERS: Remove all filters. | 102 | * @VFDI_OP_REMOVE_ALL_FILTERS: Remove all filters. |
103 | * @VFDI_OP_SET_STATUS_PAGE: Set the DMA page(s) used for status updates | 103 | * @VFDI_OP_SET_STATUS_PAGE: Set the DMA page(s) used for status updates |
104 | * from PF and write the initial status. | 104 | * from PF and write the initial status. |
@@ -148,7 +148,7 @@ enum vfdi_op { | |||
148 | * @u.init_txq.flags: Checksum offload flags. | 148 | * @u.init_txq.flags: Checksum offload flags. |
149 | * @u.init_txq.addr: Array of length %u.init_txq.buf_count containing DMA | 149 | * @u.init_txq.addr: Array of length %u.init_txq.buf_count containing DMA |
150 | * address of each page backing the transmit queue. | 150 | * address of each page backing the transmit queue. |
151 | * @u.mac_filter.rxq: Insert MAC filter at VF local address/VLAN targetting | 151 | * @u.mac_filter.rxq: Insert MAC filter at VF local address/VLAN targeting |
152 | * all traffic at this receive queue. | 152 | * all traffic at this receive queue. |
153 | * @u.mac_filter.flags: MAC filter flags. | 153 | * @u.mac_filter.flags: MAC filter flags. |
154 | * @u.set_status_page.dma_addr: Base address for the &struct vfdi_status. | 154 | * @u.set_status_page.dma_addr: Base address for the &struct vfdi_status. |
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index a0ea84fe6519..5336594abed1 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | |||
@@ -609,7 +609,7 @@ static int stmmac_hwtstamp_ioctl(struct net_device *dev, struct ifreq *ifr) | |||
609 | * where, freq_div_ratio = clk_ptp_ref_i/50MHz | 609 | * where, freq_div_ratio = clk_ptp_ref_i/50MHz |
610 | * hence, addend = ((2^32) * 50MHz)/clk_ptp_ref_i; | 610 | * hence, addend = ((2^32) * 50MHz)/clk_ptp_ref_i; |
611 | * NOTE: clk_ptp_ref_i should be >= 50MHz to | 611 | * NOTE: clk_ptp_ref_i should be >= 50MHz to |
612 | * achive 20ns accuracy. | 612 | * achieve 20ns accuracy. |
613 | * | 613 | * |
614 | * 2^x * y == (y << x), hence | 614 | * 2^x * y == (y << x), hence |
615 | * 2^32 * 50000000 ==> (50000000 << 32) | 615 | * 2^32 * 50000000 ==> (50000000 << 32) |
diff --git a/drivers/net/ethernet/sun/sungem.c b/drivers/net/ethernet/sun/sungem.c index fef5dec2cffe..74e9b148378c 100644 --- a/drivers/net/ethernet/sun/sungem.c +++ b/drivers/net/ethernet/sun/sungem.c | |||
@@ -2175,7 +2175,7 @@ static int gem_do_start(struct net_device *dev) | |||
2175 | } | 2175 | } |
2176 | 2176 | ||
2177 | /* Mark us as attached again if we come from resume(), this has | 2177 | /* Mark us as attached again if we come from resume(), this has |
2178 | * no effect if we weren't detatched and needs to be done now. | 2178 | * no effect if we weren't detached and needs to be done now. |
2179 | */ | 2179 | */ |
2180 | netif_device_attach(dev); | 2180 | netif_device_attach(dev); |
2181 | 2181 | ||
@@ -2794,7 +2794,7 @@ static void gem_remove_one(struct pci_dev *pdev) | |||
2794 | 2794 | ||
2795 | unregister_netdev(dev); | 2795 | unregister_netdev(dev); |
2796 | 2796 | ||
2797 | /* Ensure reset task is truely gone */ | 2797 | /* Ensure reset task is truly gone */ |
2798 | cancel_work_sync(&gp->reset_task); | 2798 | cancel_work_sync(&gp->reset_task); |
2799 | 2799 | ||
2800 | /* Free resources */ | 2800 | /* Free resources */ |
diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c index a1bbaf6352ba..b536b4c82752 100644 --- a/drivers/net/ethernet/ti/cpsw.c +++ b/drivers/net/ethernet/ti/cpsw.c | |||
@@ -726,7 +726,7 @@ static void cpsw_rx_handler(void *token, int len, int status) | |||
726 | if (ndev_status && (status >= 0)) { | 726 | if (ndev_status && (status >= 0)) { |
727 | /* The packet received is for the interface which | 727 | /* The packet received is for the interface which |
728 | * is already down and the other interface is up | 728 | * is already down and the other interface is up |
729 | * and running, intead of freeing which results | 729 | * and running, instead of freeing which results |
730 | * in reducing of the number of rx descriptor in | 730 | * in reducing of the number of rx descriptor in |
731 | * DMA engine, requeue skb back to cpdma. | 731 | * DMA engine, requeue skb back to cpdma. |
732 | */ | 732 | */ |
diff --git a/drivers/net/ethernet/toshiba/ps3_gelic_net.c b/drivers/net/ethernet/toshiba/ps3_gelic_net.c index bb7992804664..ac62a5e248b0 100644 --- a/drivers/net/ethernet/toshiba/ps3_gelic_net.c +++ b/drivers/net/ethernet/toshiba/ps3_gelic_net.c | |||
@@ -1065,7 +1065,7 @@ refill: | |||
1065 | 1065 | ||
1066 | /* | 1066 | /* |
1067 | * this call can fail, but for now, just leave this | 1067 | * this call can fail, but for now, just leave this |
1068 | * decriptor without skb | 1068 | * descriptor without skb |
1069 | */ | 1069 | */ |
1070 | gelic_descr_prepare_rx(card, descr); | 1070 | gelic_descr_prepare_rx(card, descr); |
1071 | 1071 | ||
diff --git a/drivers/net/ethernet/wiznet/w5100.c b/drivers/net/ethernet/wiznet/w5100.c index a495931a66a1..f5498c26b3c7 100644 --- a/drivers/net/ethernet/wiznet/w5100.c +++ b/drivers/net/ethernet/wiznet/w5100.c | |||
@@ -56,7 +56,7 @@ MODULE_LICENSE("GPL"); | |||
56 | 56 | ||
57 | #define W5100_S0_REGS 0x0400 | 57 | #define W5100_S0_REGS 0x0400 |
58 | #define W5100_S0_MR 0x0400 /* S0 Mode Register */ | 58 | #define W5100_S0_MR 0x0400 /* S0 Mode Register */ |
59 | #define S0_MR_MACRAW 0x04 /* MAC RAW mode (promiscous) */ | 59 | #define S0_MR_MACRAW 0x04 /* MAC RAW mode (promiscuous) */ |
60 | #define S0_MR_MACRAW_MF 0x44 /* MAC RAW mode (filtered) */ | 60 | #define S0_MR_MACRAW_MF 0x44 /* MAC RAW mode (filtered) */ |
61 | #define W5100_S0_CR 0x0401 /* S0 Command Register */ | 61 | #define W5100_S0_CR 0x0401 /* S0 Command Register */ |
62 | #define S0_CR_OPEN 0x01 /* OPEN command */ | 62 | #define S0_CR_OPEN 0x01 /* OPEN command */ |
diff --git a/drivers/net/ethernet/wiznet/w5300.c b/drivers/net/ethernet/wiznet/w5300.c index 09322d9db578..ca0c631ed628 100644 --- a/drivers/net/ethernet/wiznet/w5300.c +++ b/drivers/net/ethernet/wiznet/w5300.c | |||
@@ -63,7 +63,7 @@ MODULE_LICENSE("GPL"); | |||
63 | #define IDR_W5300 0x5300 /* =0x5300 for WIZnet W5300 */ | 63 | #define IDR_W5300 0x5300 /* =0x5300 for WIZnet W5300 */ |
64 | #define W5300_S0_MR 0x0200 /* S0 Mode Register */ | 64 | #define W5300_S0_MR 0x0200 /* S0 Mode Register */ |
65 | #define S0_MR_CLOSED 0x0000 /* Close mode */ | 65 | #define S0_MR_CLOSED 0x0000 /* Close mode */ |
66 | #define S0_MR_MACRAW 0x0004 /* MAC RAW mode (promiscous) */ | 66 | #define S0_MR_MACRAW 0x0004 /* MAC RAW mode (promiscuous) */ |
67 | #define S0_MR_MACRAW_MF 0x0044 /* MAC RAW mode (filtered) */ | 67 | #define S0_MR_MACRAW_MF 0x0044 /* MAC RAW mode (filtered) */ |
68 | #define W5300_S0_CR 0x0202 /* S0 Command Register */ | 68 | #define W5300_S0_CR 0x0202 /* S0 Command Register */ |
69 | #define S0_CR_OPEN 0x0001 /* OPEN command */ | 69 | #define S0_CR_OPEN 0x0001 /* OPEN command */ |