git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
[safe/jmp/linux-2.6]
/
drivers
/
net
/
pcmcia
/
smc91c92_cs.c
diff --git
a/drivers/net/pcmcia/smc91c92_cs.c
b/drivers/net/pcmcia/smc91c92_cs.c
index
59796e7
..
7b6fe89
100644
(file)
--- a/
drivers/net/pcmcia/smc91c92_cs.c
+++ b/
drivers/net/pcmcia/smc91c92_cs.c
@@
-1228,7
+1228,6
@@
static void smc_hardware_send_packet(struct net_device * dev)
dev_kfree_skb_irq(skb);
dev->trans_start = jiffies;
netif_start_queue(dev);
dev_kfree_skb_irq(skb);
dev->trans_start = jiffies;
netif_start_queue(dev);
- return;
}
/*====================================================================*/
}
/*====================================================================*/
@@
-1243,7
+1242,7
@@
static void smc_tx_timeout(struct net_device *dev)
dev->name, inw(ioaddr)&0xff, inw(ioaddr + 2));
dev->stats.tx_errors++;
smc_reset(dev);
dev->name, inw(ioaddr)&0xff, inw(ioaddr + 2));
dev->stats.tx_errors++;
smc_reset(dev);
- dev->trans_start = jiffies;
+ dev->trans_start = jiffies;
/* prevent tx timeout */
smc->saved_skb = NULL;
netif_wake_queue(dev);
}
smc->saved_skb = NULL;
netif_wake_queue(dev);
}
@@
-1358,7
+1357,6
@@
static void smc_tx_err(struct net_device * dev)
smc->packets_waiting--;
outw(saved_packet, ioaddr + PNR_ARR);
smc->packets_waiting--;
outw(saved_packet, ioaddr + PNR_ARR);
- return;
}
/*====================================================================*/
}
/*====================================================================*/
@@
-1578,8
+1576,6
@@
static void smc_rx(struct net_device *dev)
}
/* Let the MMU free the memory of this packet. */
outw(MC_RELEASE, ioaddr + MMU_CMD);
}
/* Let the MMU free the memory of this packet. */
outw(MC_RELEASE, ioaddr + MMU_CMD);
-
- return;
}
/*======================================================================
}
/*======================================================================
@@
-1610,10
+1606,10
@@
static void set_rx_mode(struct net_device *dev)
rx_cfg_setting = RxStripCRC | RxEnable | RxAllMulti;
else {
if (!netdev_mc_empty(dev)) {
rx_cfg_setting = RxStripCRC | RxEnable | RxAllMulti;
else {
if (!netdev_mc_empty(dev)) {
- struct
dev_mc_list *mc_addr
;
+ struct
netdev_hw_addr *ha
;
- netdev_for_each_mc_addr(
mc_addr
, dev) {
- u_int position = ether_crc(6,
mc_addr->dmi_
addr);
+ netdev_for_each_mc_addr(
ha
, dev) {
+ u_int position = ether_crc(6,
ha->
addr);
multicast_table[position >> 29] |= 1 << ((position >> 26) & 7);
}
}
multicast_table[position >> 29] |= 1 << ((position >> 26) & 7);
}
}
@@
-1629,8
+1625,6
@@
static void set_rx_mode(struct net_device *dev)
outw(rx_cfg_setting, ioaddr + RCR);
SMC_SELECT_BANK(2);
spin_unlock_irqrestore(&smc->lock, flags);
outw(rx_cfg_setting, ioaddr + RCR);
SMC_SELECT_BANK(2);
spin_unlock_irqrestore(&smc->lock, flags);
-
- return;
}
/*======================================================================
}
/*======================================================================