projects
/
deliverable
/
linux.git
/ 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
[deliverable/linux.git]
/
drivers
/
net
/
sunbmac.c
diff --git
a/drivers/net/sunbmac.c
b/drivers/net/sunbmac.c
index 018d0fca9422bc2760c835b6f9a9de46670da7e1..7f69c7f176c457f7d6d46f58fda37ab7363c4b3a 100644
(file)
--- a/
drivers/net/sunbmac.c
+++ b/
drivers/net/sunbmac.c
@@
-878,7
+878,6
@@
static void bigmac_rx(struct bigmac *bp)
/* No checksums done by the BigMAC ;-( */
skb->protocol = eth_type_trans(skb, bp->dev);
netif_rx(skb);
/* No checksums done by the BigMAC ;-( */
skb->protocol = eth_type_trans(skb, bp->dev);
netif_rx(skb);
- bp->dev->last_rx = jiffies;
bp->enet_stats.rx_packets++;
bp->enet_stats.rx_bytes += len;
next:
bp->enet_stats.rx_packets++;
bp->enet_stats.rx_bytes += len;
next:
@@
-917,7
+916,7
@@
static irqreturn_t bigmac_interrupt(int irq, void *dev_id)
static int bigmac_open(struct net_device *dev)
{
static int bigmac_open(struct net_device *dev)
{
- struct bigmac *bp =
(struct bigmac *) dev->priv
;
+ struct bigmac *bp =
netdev_priv(dev)
;
int ret;
ret = request_irq(dev->irq, &bigmac_interrupt, IRQF_SHARED, dev->name, bp);
int ret;
ret = request_irq(dev->irq, &bigmac_interrupt, IRQF_SHARED, dev->name, bp);
@@
-934,7
+933,7
@@
static int bigmac_open(struct net_device *dev)
static int bigmac_close(struct net_device *dev)
{
static int bigmac_close(struct net_device *dev)
{
- struct bigmac *bp =
(struct bigmac *) dev->priv
;
+ struct bigmac *bp =
netdev_priv(dev)
;
del_timer(&bp->bigmac_timer);
bp->timer_state = asleep;
del_timer(&bp->bigmac_timer);
bp->timer_state = asleep;
@@
-948,7
+947,7
@@
static int bigmac_close(struct net_device *dev)
static void bigmac_tx_timeout(struct net_device *dev)
{
static void bigmac_tx_timeout(struct net_device *dev)
{
- struct bigmac *bp =
(struct bigmac *) dev->priv
;
+ struct bigmac *bp =
netdev_priv(dev)
;
bigmac_init_hw(bp, 0);
netif_wake_queue(dev);
bigmac_init_hw(bp, 0);
netif_wake_queue(dev);
@@
-957,7
+956,7
@@
static void bigmac_tx_timeout(struct net_device *dev)
/* Put a packet on the wire. */
static int bigmac_start_xmit(struct sk_buff *skb, struct net_device *dev)
{
/* Put a packet on the wire. */
static int bigmac_start_xmit(struct sk_buff *skb, struct net_device *dev)
{
- struct bigmac *bp =
(struct bigmac *) dev->priv
;
+ struct bigmac *bp =
netdev_priv(dev)
;
int len, entry;
u32 mapping;
int len, entry;
u32 mapping;
@@
-990,7
+989,7
@@
static int bigmac_start_xmit(struct sk_buff *skb, struct net_device *dev)
static struct net_device_stats *bigmac_get_stats(struct net_device *dev)
{
static struct net_device_stats *bigmac_get_stats(struct net_device *dev)
{
- struct bigmac *bp =
(struct bigmac *) dev->priv
;
+ struct bigmac *bp =
netdev_priv(dev)
;
bigmac_get_counters(bp, bp->bregs);
return &bp->enet_stats;
bigmac_get_counters(bp, bp->bregs);
return &bp->enet_stats;
@@
-998,7
+997,7
@@
static struct net_device_stats *bigmac_get_stats(struct net_device *dev)
static void bigmac_set_multicast(struct net_device *dev)
{
static void bigmac_set_multicast(struct net_device *dev)
{
- struct bigmac *bp =
(struct bigmac *) dev->priv
;
+ struct bigmac *bp =
netdev_priv(dev)
;
void __iomem *bregs = bp->bregs;
struct dev_mc_list *dmi = dev->mc_list;
char *addrs;
void __iomem *bregs = bp->bregs;
struct dev_mc_list *dmi = dev->mc_list;
char *addrs;
@@
-1061,7
+1060,7
@@
static void bigmac_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *i
static u32 bigmac_get_link(struct net_device *dev)
{
static u32 bigmac_get_link(struct net_device *dev)
{
- struct bigmac *bp =
dev->priv
;
+ struct bigmac *bp =
netdev_priv(dev)
;
spin_lock_irq(&bp->lock);
bp->sw_bmsr = bigmac_tcvr_read(bp, bp->tregs, BIGMAC_BMSR);
spin_lock_irq(&bp->lock);
bp->sw_bmsr = bigmac_tcvr_read(bp, bp->tregs, BIGMAC_BMSR);
@@
-1081,7
+1080,6
@@
static int __devinit bigmac_ether_init(struct of_device *op,
static int version_printed;
struct net_device *dev;
u8 bsizes, bsizes_more;
static int version_printed;
struct net_device *dev;
u8 bsizes, bsizes_more;
- DECLARE_MAC_BUF(mac);
struct bigmac *bp;
int i;
struct bigmac *bp;
int i;
@@
-1212,8
+1210,8
@@
static int __devinit bigmac_ether_init(struct of_device *op,
dev_set_drvdata(&bp->bigmac_op->dev, bp);
dev_set_drvdata(&bp->bigmac_op->dev, bp);
- printk(KERN_INFO "%s: BigMAC 100baseT Ethernet %
s
\n",
- dev->name,
print_mac(mac, dev->dev_addr)
);
+ printk(KERN_INFO "%s: BigMAC 100baseT Ethernet %
pM
\n",
+ dev->name,
dev->dev_addr
);
return 0;
return 0;
@@
-1235,7
+1233,7
@@
fail_and_cleanup:
bp->bmac_block,
bp->bblock_dvma);
bp->bmac_block,
bp->bblock_dvma);
- /* This also frees the co-located
'dev->priv'
*/
+ /* This also frees the co-located
private data
*/
free_netdev(dev);
return -ENODEV;
}
free_netdev(dev);
return -ENODEV;
}
This page took
0.026295 seconds
and
5
git commands to generate.