diff options
Diffstat (limited to 'drivers/net/hamradio/dmascc.c')
-rw-r--r-- | drivers/net/hamradio/dmascc.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/net/hamradio/dmascc.c b/drivers/net/hamradio/dmascc.c index e8cfadefa4b6..e67103396ed7 100644 --- a/drivers/net/hamradio/dmascc.c +++ b/drivers/net/hamradio/dmascc.c | |||
@@ -572,7 +572,7 @@ static int __init setup_adapter(int card_base, int type, int n) | |||
572 | priv->param.persist = 256; | 572 | priv->param.persist = 256; |
573 | priv->param.dma = -1; | 573 | priv->param.dma = -1; |
574 | INIT_WORK(&priv->rx_work, rx_bh); | 574 | INIT_WORK(&priv->rx_work, rx_bh); |
575 | dev->priv = priv; | 575 | dev->ml_priv = priv; |
576 | sprintf(dev->name, "dmascc%i", 2 * n + i); | 576 | sprintf(dev->name, "dmascc%i", 2 * n + i); |
577 | dev->base_addr = card_base; | 577 | dev->base_addr = card_base; |
578 | dev->irq = irq; | 578 | dev->irq = irq; |
@@ -720,7 +720,7 @@ static int read_scc_data(struct scc_priv *priv) | |||
720 | 720 | ||
721 | static int scc_open(struct net_device *dev) | 721 | static int scc_open(struct net_device *dev) |
722 | { | 722 | { |
723 | struct scc_priv *priv = dev->priv; | 723 | struct scc_priv *priv = dev->ml_priv; |
724 | struct scc_info *info = priv->info; | 724 | struct scc_info *info = priv->info; |
725 | int card_base = priv->card_base; | 725 | int card_base = priv->card_base; |
726 | 726 | ||
@@ -862,7 +862,7 @@ static int scc_open(struct net_device *dev) | |||
862 | 862 | ||
863 | static int scc_close(struct net_device *dev) | 863 | static int scc_close(struct net_device *dev) |
864 | { | 864 | { |
865 | struct scc_priv *priv = dev->priv; | 865 | struct scc_priv *priv = dev->ml_priv; |
866 | struct scc_info *info = priv->info; | 866 | struct scc_info *info = priv->info; |
867 | int card_base = priv->card_base; | 867 | int card_base = priv->card_base; |
868 | 868 | ||
@@ -891,7 +891,7 @@ static int scc_close(struct net_device *dev) | |||
891 | 891 | ||
892 | static int scc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) | 892 | static int scc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) |
893 | { | 893 | { |
894 | struct scc_priv *priv = dev->priv; | 894 | struct scc_priv *priv = dev->ml_priv; |
895 | 895 | ||
896 | switch (cmd) { | 896 | switch (cmd) { |
897 | case SIOCGSCCPARAM: | 897 | case SIOCGSCCPARAM: |
@@ -918,7 +918,7 @@ static int scc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) | |||
918 | 918 | ||
919 | static int scc_send_packet(struct sk_buff *skb, struct net_device *dev) | 919 | static int scc_send_packet(struct sk_buff *skb, struct net_device *dev) |
920 | { | 920 | { |
921 | struct scc_priv *priv = dev->priv; | 921 | struct scc_priv *priv = dev->ml_priv; |
922 | unsigned long flags; | 922 | unsigned long flags; |
923 | int i; | 923 | int i; |
924 | 924 | ||
@@ -963,7 +963,7 @@ static int scc_send_packet(struct sk_buff *skb, struct net_device *dev) | |||
963 | 963 | ||
964 | static struct net_device_stats *scc_get_stats(struct net_device *dev) | 964 | static struct net_device_stats *scc_get_stats(struct net_device *dev) |
965 | { | 965 | { |
966 | struct scc_priv *priv = dev->priv; | 966 | struct scc_priv *priv = dev->ml_priv; |
967 | 967 | ||
968 | return &priv->stats; | 968 | return &priv->stats; |
969 | } | 969 | } |
@@ -1283,7 +1283,6 @@ static void rx_bh(struct work_struct *ugli_api) | |||
1283 | memcpy(&data[1], priv->rx_buf[i], cb); | 1283 | memcpy(&data[1], priv->rx_buf[i], cb); |
1284 | skb->protocol = ax25_type_trans(skb, priv->dev); | 1284 | skb->protocol = ax25_type_trans(skb, priv->dev); |
1285 | netif_rx(skb); | 1285 | netif_rx(skb); |
1286 | priv->dev->last_rx = jiffies; | ||
1287 | priv->stats.rx_packets++; | 1286 | priv->stats.rx_packets++; |
1288 | priv->stats.rx_bytes += cb; | 1287 | priv->stats.rx_bytes += cb; |
1289 | } | 1288 | } |