+4 -4

drivers/net/ethernet/emulex/benet/be.h

reviewed

··· 672 672 struct be_error_recovery error_recovery; 673 673 }; 674 674 675 675 - /* Used for defered FW config cmds. Add fields to this struct as reqd */ 675 675 + /* Used for deferred FW config cmds. Add fields to this struct as reqd */ 676 676 struct be_cmd_work { 677 677 struct work_struct work; 678 678 struct be_adapter *adapter; ··· 700 700 #define be_max_rxqs(adapter) (adapter->res.max_rx_qs) 701 701 /* Max number of EQs available for the function (NIC + RoCE (if enabled)) */ 702 702 #define be_max_func_eqs(adapter) (adapter->res.max_evt_qs) 703 703 - /* Max number of EQs available avaialble only for NIC */ 703 703 + /* Max number of EQs available only for NIC */ 704 704 #define be_max_nic_eqs(adapter) (adapter->res.max_nic_evt_qs) 705 705 #define be_if_cap_flags(adapter) (adapter->res.if_cap_flags) 706 706 #define be_max_pf_pool_rss_tables(adapter) \ 707 707 (adapter->pool_res.max_rss_tables) 708 708 - /* Max irqs avaialble for NIC */ 708 708 + /* Max irqs available for NIC */ 709 709 #define be_max_irqs(adapter) \ 710 710 (min_t(u16, be_max_nic_eqs(adapter), num_online_cpus())) 711 711 712 712 /* Max irqs *needed* for RX queues */ 713 713 static inline u16 be_max_rx_irqs(struct be_adapter *adapter) 714 714 { 715 715 - /* If no RSS, need atleast one irq for def-RXQ */ 715 715 + /* If no RSS, need at least one irq for def-RXQ */ 716 716 u16 num = max_t(u16, be_max_rss(adapter), 1); 717 717 718 718 return min_t(u16, num, be_max_irqs(adapter));

+3 -3

drivers/net/ethernet/emulex/benet/be_cmds.c

reviewed

··· 1941 1941 return 0; 1942 1942 } 1943 1943 1944 1944 - /* Uses sycnhronous mcc */ 1944 1944 + /* Uses synchronous mcc */ 1945 1945 int be_cmd_vlan_config(struct be_adapter *adapter, u32 if_id, u16 *vtag_array, 1946 1946 u32 num, u32 domain) 1947 1947 { ··· 2035 2035 return __be_cmd_rx_filter(adapter, flags, value); 2036 2036 } 2037 2037 2038 2038 - /* Uses synchrounous mcc */ 2038 2038 + /* Uses synchronous mcc */ 2039 2039 int be_cmd_set_flow_control(struct be_adapter *adapter, u32 tx_fc, u32 rx_fc) 2040 2040 { 2041 2041 struct be_mcc_wrb *wrb; ··· 2074 2074 return status; 2075 2075 } 2076 2076 2077 2077 - /* Uses sycn mcc */ 2077 2077 + /* Uses sync mcc */ 2078 2078 int be_cmd_get_flow_control(struct be_adapter *adapter, u32 *tx_fc, u32 *rx_fc) 2079 2079 { 2080 2080 struct be_mcc_wrb *wrb;

+3 -3

drivers/net/ethernet/emulex/benet/be_cmds.h

reviewed

··· 1134 1134 u8 fw_on_flash_version_string[FW_VER_LEN]; 1135 1135 } __packed; 1136 1136 1137 1137 - /******************** Set Flow Contrl *******************/ 1137 1137 + /******************** Set Flow Control *******************/ 1138 1138 struct be_cmd_req_set_flow_control { 1139 1139 struct be_cmd_req_hdr hdr; 1140 1140 u16 tx_flow_control; 1141 1141 u16 rx_flow_control; 1142 1142 } __packed; 1143 1143 1144 1144 - /******************** Get Flow Contrl *******************/ 1144 1144 + /******************** Get Flow Control *******************/ 1145 1145 struct be_cmd_req_get_flow_control { 1146 1146 struct be_cmd_req_hdr hdr; 1147 1147 u32 rsvd; ··· 2069 2069 struct be_hw_stats_v2 hw_stats; 2070 2070 }; 2071 2071 2072 2072 - /************** get fat capabilites *******************/ 2072 2072 + /************** get fat capabilities *******************/ 2073 2073 #define MAX_MODULES 27 2074 2074 #define MAX_MODES 4 2075 2075 #define MODE_UART 0

+3 -3

drivers/net/ethernet/emulex/benet/be_ethtool.c

reviewed

··· 142 142 * to HW. 143 143 */ 144 144 {DRVSTAT_RX_INFO(rx_post_fail)}, 145 145 - /* Recevied packets dropped due to skb allocation failure */ 145 145 + /* Received packets dropped due to skb allocation failure */ 146 146 {DRVSTAT_RX_INFO(rx_drops_no_skbs)}, 147 147 /* Received packets dropped due to lack of available fetched buffers 148 148 * posted by the driver. ··· 189 189 {DRVSTAT_TX_INFO(tx_bytes)}, 190 190 {DRVSTAT_TX_INFO(tx_pkts)}, 191 191 {DRVSTAT_TX_INFO(tx_vxlan_offload_pkts)}, 192 192 - /* Number of skbs queued for trasmission by the driver */ 192 192 + /* Number of skbs queued for transmission by the driver */ 193 193 {DRVSTAT_TX_INFO(tx_reqs)}, 194 194 /* Number of times the TX queue was stopped due to lack 195 195 * of spaces in the TXQ. ··· 1222 1222 ch->tx_count = adapter->num_tx_qs - ch->combined_count; 1223 1223 1224 1224 ch->max_combined = be_max_qp_irqs(adapter); 1225 1225 - /* The user must create atleast one combined channel */ 1225 1225 + /* The user must create at least one combined channel */ 1226 1226 ch->max_rx = be_max_rx_irqs(adapter) - 1; 1227 1227 ch->max_tx = be_max_tx_irqs(adapter) - 1; 1228 1228 }

+3 -3

drivers/net/ethernet/emulex/benet/be_hw.h

reviewed

··· 16 16 * The software must write this register twice to post any command. First, 17 17 * it writes the register with hi=1 and the upper bits of the physical address 18 18 * for the MAILBOX structure. Software must poll the ready bit until this 19 19 - * is acknowledged. Then, sotware writes the register with hi=0 with the lower 19 19 + * is acknowledged. Then, software writes the register with hi=0 with the lower 20 20 * bits in the address. It must poll the ready bit until the command is 21 21 * complete. Upon completion, the MAILBOX will contain a valid completion 22 22 * queue entry. ··· 27 27 28 28 #define MPU_EP_CONTROL 0 29 29 30 30 - /********** MPU semphore: used for SH & BE *************/ 30 30 + /********** MPU semaphore: used for SH & BE *************/ 31 31 #define SLIPORT_SOFTRESET_OFFSET 0x5c /* CSR BAR offset */ 32 32 #define SLIPORT_SEMAPHORE_OFFSET_BEx 0xac /* CSR BAR offset */ 33 33 #define SLIPORT_SEMAPHORE_OFFSET_SH 0x94 /* PCI-CFG offset */ ··· 39 39 /* Soft Reset register masks */ 40 40 #define SLIPORT_SOFTRESET_SR_MASK 0x00000080 /* SR bit */ 41 41 42 42 - /* MPU semphore POST stage values */ 42 42 + /* MPU semaphore POST stage values */ 43 43 #define POST_STAGE_AWAITING_HOST_RDY 0x1 /* FW awaiting goahead from host */ 44 44 #define POST_STAGE_HOST_RDY 0x2 /* Host has given go-ahed to FW */ 45 45 #define POST_STAGE_BE_RESET 0x3 /* Host wants to reset chip */

+8 -8

drivers/net/ethernet/emulex/benet/be_main.c

reviewed

··· 61 61 }; 62 62 MODULE_DEVICE_TABLE(pci, be_dev_ids); 63 63 64 64 - /* Workqueue used by all functions for defering cmd calls to the adapter */ 64 64 + /* Workqueue used by all functions for deferring cmd calls to the adapter */ 65 65 static struct workqueue_struct *be_wq; 66 66 67 67 /* UE Status Low CSR */ ··· 1129 1129 struct iphdr *ip; 1130 1130 1131 1131 /* For padded packets, BE HW modifies tot_len field in IP header 1132 1132 - * incorrecly when VLAN tag is inserted by HW. 1132 1132 + * incorrectly when VLAN tag is inserted by HW. 1133 1133 * For padded packets, Lancer computes incorrect checksum. 1134 1134 */ 1135 1135 eth_hdr_len = ntohs(skb->protocol) == ETH_P_8021Q ? ··· 2568 2568 rxcp->vlanf = 0; 2569 2569 } 2570 2570 2571 2571 - /* As the compl has been parsed, reset it; we wont touch it again */ 2571 2571 + /* As the compl has been parsed, reset it; we won't touch it again */ 2572 2572 compl->dw[offsetof(struct amap_eth_rx_compl_v1, valid) / 32] = 0; 2573 2573 2574 2574 queue_tail_inc(&rxo->cq); ··· 2727 2727 if (txcp->status) { 2728 2728 if (lancer_chip(adapter)) { 2729 2729 lancer_update_tx_err(txo, txcp->status); 2730 2730 - /* Reset the adapter incase of TSO, 2730 2730 + /* Reset the adapter in case of TSO, 2731 2731 * SGE or Parity error 2732 2732 */ 2733 2733 if (txcp->status == LANCER_TX_COMP_LSO_ERR || ··· 3125 3125 adapter->num_rss_qs = 3126 3126 min(adapter->num_evt_qs, adapter->cfg_num_rx_irqs); 3127 3127 3128 3128 - /* We'll use RSS only if atleast 2 RSS rings are supported. */ 3128 3128 + /* We'll use RSS only if at least 2 RSS rings are supported. */ 3129 3129 if (adapter->num_rss_qs < 2) 3130 3130 adapter->num_rss_qs = 0; 3131 3131 ··· 3167 3167 /* IRQ is not expected when NAPI is scheduled as the EQ 3168 3168 * will not be armed. 3169 3169 * But, this can happen on Lancer INTx where it takes 3170 3170 - * a while to de-assert INTx or in BE2 where occasionaly 3170 3170 + * a while to de-assert INTx or in BE2 where occasionally 3171 3171 * an interrupt may be raised even when EQ is unarmed. 3172 3172 * If NAPI is already scheduled, then counting & notifying 3173 3173 * events will orphan them. ··· 4415 4415 /* HW supports only MAX_PORT_RSS_TABLES RSS Policy Tables per port. 4416 4416 * However, this HW limitation is not exposed to the host via any SLI cmd. 4417 4417 * As a result, in the case of SRIOV and in particular multi-partition configs 4418 4418 - * the driver needs to calcuate a proportional share of RSS Tables per PF-pool 4418 4418 + * the driver needs to calculate a proportional share of RSS Tables per PF-pool 4419 4419 * for distribution between the VFs. This self-imposed limit will determine the 4420 4420 * no: of VFs for which RSS can be enabled. 4421 4421 */ ··· 4519 4519 if (status) 4520 4520 return status; 4521 4521 4522 4522 - /* If a deafault RXQ must be created, we'll use up one RSSQ*/ 4522 4522 + /* If a default RXQ must be created, we'll use up one RSSQ*/ 4523 4523 if (res.max_rss_qs && res.max_rss_qs == res.max_rx_qs && 4524 4524 !(res.if_cap_flags & BE_IF_FLAGS_DEFQ_RSS)) 4525 4525 res.max_rss_qs -= 1;

+2 -2

drivers/net/ethernet/micrel/ks8842.c

reviewed

··· 242 242 msleep(10); 243 243 iowrite16(0, adapter->hw_addr + REG_GRR); 244 244 } else { 245 245 - /* The KS8842 goes haywire when doing softare reset 245 245 + /* The KS8842 goes haywire when doing software reset 246 246 * a work around in the timberdale IP is implemented to 247 247 * do a hardware reset instead 248 248 ks8842_write16(adapter, 3, 1, REG_GRR); ··· 312 312 /* aggressive back off in half duplex */ 313 313 ks8842_enable_bits(adapter, 32, 1 << 8, REG_SGCR1); 314 314 315 315 - /* enable no excessive collison drop */ 315 315 + /* enable no excessive collision drop */ 316 316 ks8842_enable_bits(adapter, 32, 1 << 3, REG_SGCR2); 317 317 318 318 /* Enable port 1 force flow control / back pressure / transmit / recv */

+1 -1

drivers/net/ethernet/micrel/ks8851_common.c

reviewed

··· 480 480 * ks8851_net_stop - close network device 481 481 * @dev: The device being closed. 482 482 * 483 483 - * Called to close down a network device which has been active. Cancell any 483 483 + * Called to close down a network device which has been active. Cancel any 484 484 * work, shutdown the RX and TX process and then place the chip into a low 485 485 * power state whilst it is not being used. 486 486 */

+2 -2

drivers/net/ethernet/micrel/ks8851_spi.c

reviewed

··· 39 39 * 40 40 * The @lock ensures that the chip is protected when certain operations are 41 41 * in progress. When the read or write packet transfer is in progress, most 42 42 - * of the chip registers are not ccessible until the transfer is finished and 42 42 + * of the chip registers are not accessible until the transfer is finished and 43 43 * the DMA has been de-asserted. 44 44 */ 45 45 struct ks8851_net_spi { ··· 298 298 299 299 /** 300 300 * ks8851_tx_work - process tx packet(s) 301 301 - * @work: The work strucutre what was scheduled. 301 301 + * @work: The work structure what was scheduled. 302 302 * 303 303 * This is called when a number of packets have been scheduled for 304 304 * transmission and need to be sent to the device.

+2 -2

drivers/net/ethernet/micrel/ksz884x.c

reviewed

··· 1166 1166 * @tx_cfg: Cached transmit control settings. 1167 1167 * @rx_cfg: Cached receive control settings. 1168 1168 * @intr_mask: Current interrupt mask. 1169 1169 - * @intr_set: Current interrup set. 1169 1169 + * @intr_set: Current interrupt set. 1170 1170 * @intr_blocked: Interrupt blocked. 1171 1171 * @rx_desc_info: Receive descriptor information. 1172 1172 * @tx_desc_info: Transmit descriptor information. ··· 2096 2096 } 2097 2097 2098 2098 /** 2099 2099 - * sw_init_prio_rate - initialize switch prioirty rate 2099 2099 + * sw_init_prio_rate - initialize switch priority rate 2100 2100 * @hw: The hardware instance. 2101 2101 * 2102 2102 * This routine initializes the priority rate function of the switch.

+1 -1

drivers/net/xen-netback/hash.c

reviewed

··· 3 3 * 4 4 * This program is free software; you can redistribute it and/or 5 5 * modify it under the terms of the GNU General Public License version 2 6 6 - * as published by the Free Softare Foundation; or, when distributed 6 6 + * as published by the Free Software Foundation; or, when distributed 7 7 * separately from the Linux kernel or incorporated into other 8 8 * software packages, subject to the following license: 9 9 *