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 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind...
[pandora-kernel.git]
/
drivers
/
net
/
declance.c
diff --git
a/drivers/net/declance.c
b/drivers/net/declance.c
index
8cf3cc6
..
1d973db
100644
(file)
--- a/
drivers/net/declance.c
+++ b/
drivers/net/declance.c
@@
-874,7
+874,7
@@
static inline int lance_reset(struct net_device *dev)
lance_init_ring(dev);
load_csrs(lp);
lance_init_ring(dev);
load_csrs(lp);
- dev->trans_start = jiffies;
+ dev->trans_start = jiffies;
/* prevent tx timeout */
status = init_restart_lance(lp);
return status;
}
status = init_restart_lance(lp);
return status;
}
@@
-930,7
+930,6
@@
static int lance_start_xmit(struct sk_buff *skb, struct net_device *dev)
spin_unlock_irqrestore(&lp->lock, flags);
spin_unlock_irqrestore(&lp->lock, flags);
- dev->trans_start = jiffies;
dev_kfree_skb(skb);
return NETDEV_TX_OK;
dev_kfree_skb(skb);
return NETDEV_TX_OK;
@@
-940,7
+939,7
@@
static void lance_load_multicast(struct net_device *dev)
{
struct lance_private *lp = netdev_priv(dev);
volatile u16 *ib = (volatile u16 *)dev->mem_start;
{
struct lance_private *lp = netdev_priv(dev);
volatile u16 *ib = (volatile u16 *)dev->mem_start;
- struct
dev_mc_list *dmi
;
+ struct
netdev_hw_addr *ha
;
char *addrs;
u32 crc;
char *addrs;
u32 crc;
@@
-959,8
+958,8
@@
static void lance_load_multicast(struct net_device *dev)
*lib_ptr(ib, filter[3], lp->type) = 0;
/* Add addresses */
*lib_ptr(ib, filter[3], lp->type) = 0;
/* Add addresses */
- netdev_for_each_mc_addr(
dmi
, dev) {
- addrs =
dmi->dmi_
addr;
+ netdev_for_each_mc_addr(
ha
, dev) {
+ addrs =
ha->
addr;
/* multicast address? */
if (!(*addrs & 1))
/* multicast address? */
if (!(*addrs & 1))
@@
-970,7
+969,6
@@
static void lance_load_multicast(struct net_device *dev)
crc = crc >> 26;
*lib_ptr(ib, filter[crc >> 4], lp->type) |= 1 << (crc & 0xf);
}
crc = crc >> 26;
*lib_ptr(ib, filter[crc >> 4], lp->type) |= 1 << (crc & 0xf);
}
- return;
}
static void lance_set_multicast(struct net_device *dev)
}
static void lance_set_multicast(struct net_device *dev)