projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
igb: add support for SGMII-based MDIO PHYs
[deliverable/linux.git]
/
drivers
/
net
/
macmace.c
diff --git
a/drivers/net/macmace.c
b/drivers/net/macmace.c
index 52e9a51c4c4fcf0788d2b33f74f033284779271a..c685a4656878c7793e222e448eab39c75dc93c5f 100644
(file)
--- a/
drivers/net/macmace.c
+++ b/
drivers/net/macmace.c
@@
-488,7
+488,6
@@
static int mace_xmit_start(struct sk_buff *skb, struct net_device *dev)
dev_kfree_skb(skb);
dev_kfree_skb(skb);
- dev->trans_start = jiffies;
return NETDEV_TX_OK;
}
return NETDEV_TX_OK;
}
@@
-509,7
+508,7
@@
static void mace_set_multicast(struct net_device *dev)
mb->maccc |= PROM;
} else {
unsigned char multicast_filter[8];
mb->maccc |= PROM;
} else {
unsigned char multicast_filter[8];
- struct
dev_mc_list *dmi
;
+ struct
netdev_hw_addr *ha
;
if (dev->flags & IFF_ALLMULTI) {
for (i = 0; i < 8; i++) {
if (dev->flags & IFF_ALLMULTI) {
for (i = 0; i < 8; i++) {
@@
-518,8
+517,8
@@
static void mace_set_multicast(struct net_device *dev)
} else {
for (i = 0; i < 8; i++)
multicast_filter[i] = 0;
} else {
for (i = 0; i < 8; i++)
multicast_filter[i] = 0;
- netdev_for_each_mc_addr(
dmi
, dev) {
- crc = ether_crc_le(6,
dmi->dmi_
addr);
+ netdev_for_each_mc_addr(
ha
, dev) {
+ crc = ether_crc_le(6,
ha->
addr);
/* bit number in multicast_filter */
i = crc >> 26;
multicast_filter[i >> 3] |= 1 << (i & 7);
/* bit number in multicast_filter */
i = crc >> 26;
multicast_filter[i >> 3] |= 1 << (i & 7);
This page took
0.025818 seconds
and
5
git commands to generate.