diff options
Diffstat (limited to 'drivers/net/tehuti.c')
-rw-r--r-- | drivers/net/tehuti.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/tehuti.c b/drivers/net/tehuti.c index 3397618d4d96..8564ec5cfb7f 100644 --- a/drivers/net/tehuti.c +++ b/drivers/net/tehuti.c | |||
@@ -645,7 +645,7 @@ static int bdx_ioctl_priv(struct net_device *ndev, struct ifreq *ifr, int cmd) | |||
645 | if (cmd != SIOCDEVPRIVATE) { | 645 | if (cmd != SIOCDEVPRIVATE) { |
646 | error = copy_from_user(data, ifr->ifr_data, sizeof(data)); | 646 | error = copy_from_user(data, ifr->ifr_data, sizeof(data)); |
647 | if (error) { | 647 | if (error) { |
648 | pr_err("cant copy from user\n"); | 648 | pr_err("can't copy from user\n"); |
649 | RET(-EFAULT); | 649 | RET(-EFAULT); |
650 | } | 650 | } |
651 | DBG("%d 0x%x 0x%x\n", data[0], data[1], data[2]); | 651 | DBG("%d 0x%x 0x%x\n", data[0], data[1], data[2]); |
@@ -999,7 +999,7 @@ static inline void bdx_rxdb_free_elem(struct rxdb *db, int n) | |||
999 | * | 999 | * |
1000 | * RxD fifo is smaller than RxF fifo by design. Upon high load, RxD will be | 1000 | * RxD fifo is smaller than RxF fifo by design. Upon high load, RxD will be |
1001 | * filled and packets will be dropped by nic without getting into host or | 1001 | * filled and packets will be dropped by nic without getting into host or |
1002 | * cousing interrupt. Anyway, in that condition, host has no chance to proccess | 1002 | * cousing interrupt. Anyway, in that condition, host has no chance to process |
1003 | * all packets, but dropping in nic is cheaper, since it takes 0 cpu cycles | 1003 | * all packets, but dropping in nic is cheaper, since it takes 0 cpu cycles |
1004 | */ | 1004 | */ |
1005 | 1005 | ||
@@ -1200,8 +1200,8 @@ static void bdx_recycle_skb(struct bdx_priv *priv, struct rxd_desc *rxdd) | |||
1200 | RET(); | 1200 | RET(); |
1201 | } | 1201 | } |
1202 | 1202 | ||
1203 | /* bdx_rx_receive - recieves full packets from RXD fifo and pass them to OS | 1203 | /* bdx_rx_receive - receives full packets from RXD fifo and pass them to OS |
1204 | * NOTE: a special treatment is given to non-continous descriptors | 1204 | * NOTE: a special treatment is given to non-continuous descriptors |
1205 | * that start near the end, wraps around and continue at the beginning. a second | 1205 | * that start near the end, wraps around and continue at the beginning. a second |
1206 | * part is copied right after the first, and then descriptor is interpreted as | 1206 | * part is copied right after the first, and then descriptor is interpreted as |
1207 | * normal. fifo has an extra space to allow such operations | 1207 | * normal. fifo has an extra space to allow such operations |
@@ -1584,9 +1584,9 @@ err_mem: | |||
1584 | } | 1584 | } |
1585 | 1585 | ||
1586 | /* | 1586 | /* |
1587 | * bdx_tx_space - calculates avalable space in TX fifo | 1587 | * bdx_tx_space - calculates available space in TX fifo |
1588 | * @priv - NIC private structure | 1588 | * @priv - NIC private structure |
1589 | * Returns avaliable space in TX fifo in bytes | 1589 | * Returns available space in TX fifo in bytes |
1590 | */ | 1590 | */ |
1591 | static inline int bdx_tx_space(struct bdx_priv *priv) | 1591 | static inline int bdx_tx_space(struct bdx_priv *priv) |
1592 | { | 1592 | { |