|
@@ -206,7 +206,7 @@ simeth_probe1(void)
|
|
|
|
|
|
memcpy(dev->dev_addr, mac_addr, sizeof(mac_addr));
|
|
memcpy(dev->dev_addr, mac_addr, sizeof(mac_addr));
|
|
|
|
|
|
- local = dev->priv;
|
|
|
|
|
|
+ local = netdev_priv(dev);
|
|
local->simfd = fd; /* keep track of underlying file descriptor */
|
|
local->simfd = fd; /* keep track of underlying file descriptor */
|
|
|
|
|
|
dev->open = simeth_open;
|
|
dev->open = simeth_open;
|
|
@@ -325,7 +325,7 @@ simeth_device_event(struct notifier_block *this,unsigned long event, void *ptr)
|
|
* we get DOWN then UP.
|
|
* we get DOWN then UP.
|
|
*/
|
|
*/
|
|
|
|
|
|
- local = dev->priv;
|
|
|
|
|
|
+ local = netdev_priv(dev);
|
|
/* now do it for real */
|
|
/* now do it for real */
|
|
r = event == NETDEV_UP ?
|
|
r = event == NETDEV_UP ?
|
|
netdev_attach(local->simfd, dev->irq, ntohl(ifa->ifa_local)):
|
|
netdev_attach(local->simfd, dev->irq, ntohl(ifa->ifa_local)):
|
|
@@ -380,7 +380,7 @@ frame_print(unsigned char *from, unsigned char *frame, int len)
|
|
static int
|
|
static int
|
|
simeth_tx(struct sk_buff *skb, struct net_device *dev)
|
|
simeth_tx(struct sk_buff *skb, struct net_device *dev)
|
|
{
|
|
{
|
|
- struct simeth_local *local = dev->priv;
|
|
|
|
|
|
+ struct simeth_local *local = netdev_priv(dev);
|
|
|
|
|
|
#if 0
|
|
#if 0
|
|
/* ensure we have at least ETH_ZLEN bytes (min frame size) */
|
|
/* ensure we have at least ETH_ZLEN bytes (min frame size) */
|
|
@@ -443,7 +443,7 @@ simeth_rx(struct net_device *dev)
|
|
int len;
|
|
int len;
|
|
int rcv_count = SIMETH_RECV_MAX;
|
|
int rcv_count = SIMETH_RECV_MAX;
|
|
|
|
|
|
- local = dev->priv;
|
|
|
|
|
|
+ local = netdev_priv(dev);
|
|
/*
|
|
/*
|
|
* the loop concept has been borrowed from other drivers
|
|
* the loop concept has been borrowed from other drivers
|
|
* looks to me like it's a throttling thing to avoid pushing to many
|
|
* looks to me like it's a throttling thing to avoid pushing to many
|
|
@@ -507,7 +507,7 @@ simeth_interrupt(int irq, void *dev_id)
|
|
static struct net_device_stats *
|
|
static struct net_device_stats *
|
|
simeth_get_stats(struct net_device *dev)
|
|
simeth_get_stats(struct net_device *dev)
|
|
{
|
|
{
|
|
- struct simeth_local *local = dev->priv;
|
|
|
|
|
|
+ struct simeth_local *local = netdev_priv(dev);
|
|
|
|
|
|
return &local->stats;
|
|
return &local->stats;
|
|
}
|
|
}
|