git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'stable/balloon.cleanup' and 'stable/general.cleanup' of git://git...
[pandora-kernel.git]
/
drivers
/
net
/
mlx4
/
en_tx.c
diff --git
a/drivers/net/mlx4/en_tx.c
b/drivers/net/mlx4/en_tx.c
index
01feb8f
..
b229acf
100644
(file)
--- a/
drivers/net/mlx4/en_tx.c
+++ b/
drivers/net/mlx4/en_tx.c
@@
-636,7
+636,7
@@
netdev_tx_t mlx4_en_xmit(struct sk_buff *skb, struct net_device *dev)
if (unlikely(!real_size))
goto tx_drop;
- /* Al
l
ign descriptor to TXBB size */
+ /* Align descriptor to TXBB size */
desc_size = ALIGN(real_size, TXBB_SIZE);
nr_txbb = desc_size / TXBB_SIZE;
if (unlikely(nr_txbb > MAX_DESC_TXBBS)) {