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 branch 'merge'
[pandora-kernel.git]
/
drivers
/
net
/
3c515.c
diff --git
a/drivers/net/3c515.c
b/drivers/net/3c515.c
index
4532b17
..
aedfddf
100644
(file)
--- a/
drivers/net/3c515.c
+++ b/
drivers/net/3c515.c
@@
-1003,7
+1003,8
@@
static int corkscrew_start_xmit(struct sk_buff *skb,
/* Calculate the next Tx descriptor entry. */
int entry = vp->cur_tx % TX_RING_SIZE;
struct boom_tx_desc *prev_entry;
- unsigned long flags, i;
+ unsigned long flags;
+ int i;
if (vp->tx_full) /* No room to transmit with */
return 1;