diff options
Diffstat (limited to 'drivers/staging/et131x/et131x.c')
-rw-r--r-- | drivers/staging/et131x/et131x.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c index 2c4069fcd981..3f919babe79b 100644 --- a/drivers/staging/et131x/et131x.c +++ b/drivers/staging/et131x/et131x.c @@ -802,7 +802,7 @@ static int et131x_init_eeprom(struct et131x_adapter *adapter) /* THIS IS A WORKAROUND: * I need to call this function twice to get my card in a * LG M1 Express Dual running. I tried also a msleep before this - * function, because I thougth there could be some time condidions + * function, because I thought there could be some time condidions * but it didn't work. Call the whole function twice also work. */ if (pci_read_config_byte(pdev, ET1310_PCI_EEPROM_STATUS, &eestatus)) { @@ -987,7 +987,7 @@ static void et1310_config_mac_regs1(struct et131x_adapter *adapter) writel(station1, ¯egs->station_addr_1); writel(station2, ¯egs->station_addr_2); - /* Max ethernet packet in bytes that will passed by the mac without + /* Max ethernet packet in bytes that will be passed by the mac without * being truncated. Allow the MAC to pass 4 more than our max packet * size. This is 4 for the Ethernet CRC. * @@ -3109,7 +3109,7 @@ static struct rfd *nic_rx_pkts(struct et131x_adapter *adapter) skb->protocol = eth_type_trans(skb, adapter->netdev); skb->ip_summed = CHECKSUM_NONE; - netif_rx(skb); + netif_rx_ni(skb); } else { rfd->len = 0; } @@ -4413,7 +4413,7 @@ static void et131x_up(struct net_device *netdev) /** * et131x_down - Bring down the device - * @netdev: device to be broght down + * @netdev: device to be brought down */ static void et131x_down(struct net_device *netdev) { @@ -5177,7 +5177,7 @@ static int et131x_set_mac_addr(struct net_device *netdev, void *new_mac) /* Make sure the requested MAC is valid */ if (!is_valid_ether_addr(address->sa_data)) - return -EINVAL; + return -EADDRNOTAVAIL; et131x_disable_txrx(netdev); et131x_handle_send_interrupt(adapter); |