aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2005-09-12 17:28:03 -0400
committerDavid S. Miller <davem@davemloft.net>2005-09-12 17:28:03 -0400
commitb88a762b6062f06d431af0045de4854a758646c0 (patch)
treef85f579a183fa314ea793e178e28066476f01f7f /net
parente21ce8c7c013fb223a002c70bb0a547de6c26c12 (diff)
[NETROM]: Introduct stuct nr_private
NET/ROM's virtual interfaces don't have a proper private data structure yet. Create struct nr_private and put the statistics there. Signed-off-by: Ralf Baechle DL5RB <ralf@linux-mips.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/netrom/af_netrom.c3
-rw-r--r--net/netrom/nr_dev.c11
2 files changed, 7 insertions, 7 deletions
diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c
index 8c3d3a78481e..e5d82d711cae 100644
--- a/net/netrom/af_netrom.c
+++ b/net/netrom/af_netrom.c
@@ -1392,8 +1392,7 @@ static int __init nr_proto_init(void)
1392 struct net_device *dev; 1392 struct net_device *dev;
1393 1393
1394 sprintf(name, "nr%d", i); 1394 sprintf(name, "nr%d", i);
1395 dev = alloc_netdev(sizeof(struct net_device_stats), name, 1395 dev = alloc_netdev(sizeof(struct nr_private), name, nr_setup);
1396 nr_setup);
1397 if (!dev) { 1396 if (!dev) {
1398 printk(KERN_ERR "NET/ROM: nr_proto_init - unable to allocate device structure\n"); 1397 printk(KERN_ERR "NET/ROM: nr_proto_init - unable to allocate device structure\n");
1399 goto fail; 1398 goto fail;
diff --git a/net/netrom/nr_dev.c b/net/netrom/nr_dev.c
index 909aa7f50744..4e66eef9a034 100644
--- a/net/netrom/nr_dev.c
+++ b/net/netrom/nr_dev.c
@@ -160,10 +160,9 @@ static int nr_close(struct net_device *dev)
160 160
161static int nr_xmit(struct sk_buff *skb, struct net_device *dev) 161static int nr_xmit(struct sk_buff *skb, struct net_device *dev)
162{ 162{
163 struct net_device_stats *stats = netdev_priv(dev); 163 struct nr_private *nr = netdev_priv(dev);
164 unsigned int len; 164 struct net_device_stats *stats = &nr->stats;
165 165 unsigned int len = skb->len;
166 len = skb->len;
167 166
168 if (!nr_route_frame(skb, NULL)) { 167 if (!nr_route_frame(skb, NULL)) {
169 kfree_skb(skb); 168 kfree_skb(skb);
@@ -179,7 +178,9 @@ static int nr_xmit(struct sk_buff *skb, struct net_device *dev)
179 178
180static struct net_device_stats *nr_get_stats(struct net_device *dev) 179static struct net_device_stats *nr_get_stats(struct net_device *dev)
181{ 180{
182 return netdev_priv(dev); 181 struct nr_private *nr = netdev_priv(dev);
182
183 return &nr->stats;
183} 184}
184 185
185void nr_setup(struct net_device *dev) 186void nr_setup(struct net_device *dev)