diff options
Diffstat (limited to 'drivers/net/appletalk')
-rw-r--r-- | drivers/net/appletalk/cops.c | 9 | ||||
-rw-r--r-- | drivers/net/appletalk/ipddp.c | 6 | ||||
-rw-r--r-- | drivers/net/appletalk/ltpc.c | 13 |
3 files changed, 11 insertions, 17 deletions
diff --git a/drivers/net/appletalk/cops.c b/drivers/net/appletalk/cops.c index 735fc9476403..54819a34ba0a 100644 --- a/drivers/net/appletalk/cops.c +++ b/drivers/net/appletalk/cops.c | |||
@@ -851,7 +851,6 @@ static void cops_rx(struct net_device *dev) | |||
851 | 851 | ||
852 | /* Send packet to a higher place. */ | 852 | /* Send packet to a higher place. */ |
853 | netif_rx(skb); | 853 | netif_rx(skb); |
854 | dev->last_rx = jiffies; | ||
855 | } | 854 | } |
856 | 855 | ||
857 | static void cops_timeout(struct net_device *dev) | 856 | static void cops_timeout(struct net_device *dev) |
@@ -1025,11 +1024,3 @@ static void __exit cops_module_exit(void) | |||
1025 | module_init(cops_module_init); | 1024 | module_init(cops_module_init); |
1026 | module_exit(cops_module_exit); | 1025 | module_exit(cops_module_exit); |
1027 | #endif /* MODULE */ | 1026 | #endif /* MODULE */ |
1028 | |||
1029 | /* | ||
1030 | * Local variables: | ||
1031 | * compile-command: "gcc -DMODVERSIONS -DMODULE -D__KERNEL__ -Wall -Wstrict-prototypes -O2 -c cops.c" | ||
1032 | * c-basic-offset: 4 | ||
1033 | * c-file-offsets: ((substatement-open . 0)) | ||
1034 | * End: | ||
1035 | */ | ||
diff --git a/drivers/net/appletalk/ipddp.c b/drivers/net/appletalk/ipddp.c index 1071144edd66..9a0be9b2eaad 100644 --- a/drivers/net/appletalk/ipddp.c +++ b/drivers/net/appletalk/ipddp.c | |||
@@ -108,7 +108,7 @@ static struct net_device * __init ipddp_init(void) | |||
108 | */ | 108 | */ |
109 | static struct net_device_stats *ipddp_get_stats(struct net_device *dev) | 109 | static struct net_device_stats *ipddp_get_stats(struct net_device *dev) |
110 | { | 110 | { |
111 | return dev->priv; | 111 | return netdev_priv(dev); |
112 | } | 112 | } |
113 | 113 | ||
114 | /* | 114 | /* |
@@ -170,8 +170,8 @@ static int ipddp_xmit(struct sk_buff *skb, struct net_device *dev) | |||
170 | 170 | ||
171 | skb->protocol = htons(ETH_P_ATALK); /* Protocol has changed */ | 171 | skb->protocol = htons(ETH_P_ATALK); /* Protocol has changed */ |
172 | 172 | ||
173 | ((struct net_device_stats *) dev->priv)->tx_packets++; | 173 | ((struct net_device_stats *) netdev_priv(dev))->tx_packets++; |
174 | ((struct net_device_stats *) dev->priv)->tx_bytes+=skb->len; | 174 | ((struct net_device_stats *) netdev_priv(dev))->tx_bytes += skb->len; |
175 | 175 | ||
176 | if(aarp_send_ddp(rt->dev, skb, &rt->at, NULL) < 0) | 176 | if(aarp_send_ddp(rt->dev, skb, &rt->at, NULL) < 0) |
177 | dev_kfree_skb(skb); | 177 | dev_kfree_skb(skb); |
diff --git a/drivers/net/appletalk/ltpc.c b/drivers/net/appletalk/ltpc.c index fef5560bc7a2..dc4d49605603 100644 --- a/drivers/net/appletalk/ltpc.c +++ b/drivers/net/appletalk/ltpc.c | |||
@@ -726,7 +726,8 @@ static int sendup_buffer (struct net_device *dev) | |||
726 | int dnode, snode, llaptype, len; | 726 | int dnode, snode, llaptype, len; |
727 | int sklen; | 727 | int sklen; |
728 | struct sk_buff *skb; | 728 | struct sk_buff *skb; |
729 | struct net_device_stats *stats = &((struct ltpc_private *)dev->priv)->stats; | 729 | struct ltpc_private *ltpc_priv = netdev_priv(dev); |
730 | struct net_device_stats *stats = <pc_priv->stats; | ||
730 | struct lt_rcvlap *ltc = (struct lt_rcvlap *) ltdmacbuf; | 731 | struct lt_rcvlap *ltc = (struct lt_rcvlap *) ltdmacbuf; |
731 | 732 | ||
732 | if (ltc->command != LT_RCVLAP) { | 733 | if (ltc->command != LT_RCVLAP) { |
@@ -783,7 +784,6 @@ static int sendup_buffer (struct net_device *dev) | |||
783 | 784 | ||
784 | /* toss it onwards */ | 785 | /* toss it onwards */ |
785 | netif_rx(skb); | 786 | netif_rx(skb); |
786 | dev->last_rx = jiffies; | ||
787 | return 0; | 787 | return 0; |
788 | } | 788 | } |
789 | 789 | ||
@@ -823,7 +823,8 @@ static int ltpc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) | |||
823 | { | 823 | { |
824 | struct sockaddr_at *sa = (struct sockaddr_at *) &ifr->ifr_addr; | 824 | struct sockaddr_at *sa = (struct sockaddr_at *) &ifr->ifr_addr; |
825 | /* we'll keep the localtalk node address in dev->pa_addr */ | 825 | /* we'll keep the localtalk node address in dev->pa_addr */ |
826 | struct atalk_addr *aa = &((struct ltpc_private *)dev->priv)->my_addr; | 826 | struct ltpc_private *ltpc_priv = netdev_priv(dev); |
827 | struct atalk_addr *aa = <pc_priv->my_addr; | ||
827 | struct lt_init c; | 828 | struct lt_init c; |
828 | int ltflags; | 829 | int ltflags; |
829 | 830 | ||
@@ -904,7 +905,8 @@ static int ltpc_xmit(struct sk_buff *skb, struct net_device *dev) | |||
904 | * and skb->len is the length of the ddp data + ddp header | 905 | * and skb->len is the length of the ddp data + ddp header |
905 | */ | 906 | */ |
906 | 907 | ||
907 | struct net_device_stats *stats = &((struct ltpc_private *)dev->priv)->stats; | 908 | struct ltpc_private *ltpc_priv = netdev_priv(dev); |
909 | struct net_device_stats *stats = <pc_priv->stats; | ||
908 | 910 | ||
909 | int i; | 911 | int i; |
910 | struct lt_sendlap cbuf; | 912 | struct lt_sendlap cbuf; |
@@ -943,7 +945,8 @@ static int ltpc_xmit(struct sk_buff *skb, struct net_device *dev) | |||
943 | 945 | ||
944 | static struct net_device_stats *ltpc_get_stats(struct net_device *dev) | 946 | static struct net_device_stats *ltpc_get_stats(struct net_device *dev) |
945 | { | 947 | { |
946 | struct net_device_stats *stats = &((struct ltpc_private *) dev->priv)->stats; | 948 | struct ltpc_private *ltpc_priv = netdev_priv(dev); |
949 | struct net_device_stats *stats = <pc_priv->stats; | ||
947 | return stats; | 950 | return stats; |
948 | } | 951 | } |
949 | 952 | ||