mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-29 22:02:02 +00:00
Code Issues Releases Wiki Activity

[NETROM]: Introduct stuct nr_private

Browse source 
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>
This commit is contained in:
Ralf Baechle 2005-09-12 14:28:03 -07:00 committed by David S. Miller
parent e21ce8c7c0
commit b88a762b60
3 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
include/net/netrom.h
View file

@ -6,6 +6,7 @@
#ifndef _NETROM_H #ifndef _NETROM_H
#define _NETROM_H #define _NETROM_H
#include <linux/netrom.h> #include <linux/netrom.h>
#include <linux/list.h> #include <linux/list.h>
#include <net/sock.h> #include <net/sock.h>
@ -58,6 +59,10 @@ enum {
#define NR_MAX_WINDOW_SIZE 127 /* Maximum Window Allowable - 127 */ #define NR_MAX_WINDOW_SIZE 127 /* Maximum Window Allowable - 127 */
#define NR_MAX_PACKET_SIZE 236 /* Maximum Packet Length - 236 */ #define NR_MAX_PACKET_SIZE 236 /* Maximum Packet Length - 236 */
struct nr_private {
struct net_device_stats stats;
};
struct nr_sock { struct nr_sock {
struct sock sock; struct sock sock;
ax25_address user_addr, source_addr, dest_addr; ax25_address user_addr, source_addr, dest_addr;

3
net/netrom/af_netrom.c
View file

@ -1392,8 +1392,7 @@ static int __init nr_proto_init(void)
struct net_device *dev; struct net_device *dev;
sprintf(name, "nr%d", i); sprintf(name, "nr%d", i);
dev = alloc_netdev(sizeof(struct net_device_stats), name, dev = alloc_netdev(sizeof(struct nr_private), name, nr_setup);
nr_setup);
if (!dev) { if (!dev) {
printk(KERN_ERR "NET/ROM: nr_proto_init - unable to allocate device structure\n"); printk(KERN_ERR "NET/ROM: nr_proto_init - unable to allocate device structure\n");
goto fail; goto fail;

11
net/netrom/nr_dev.c
View file

@ -160,10 +160,9 @@ static int nr_close(struct net_device *dev)
static int nr_xmit(struct sk_buff *skb, struct net_device *dev) static int nr_xmit(struct sk_buff *skb, struct net_device *dev)
{ {
struct net_device_stats *stats = netdev_priv(dev); struct nr_private *nr = netdev_priv(dev);
unsigned int len; struct net_device_stats *stats = &nr->stats;
unsigned int len = skb->len;
len = skb->len;
if (!nr_route_frame(skb, NULL)) { if (!nr_route_frame(skb, NULL)) {
kfree_skb(skb); kfree_skb(skb);
@ -179,7 +178,9 @@ static int nr_xmit(struct sk_buff *skb, struct net_device *dev)
static struct net_device_stats *nr_get_stats(struct net_device *dev) static struct net_device_stats *nr_get_stats(struct net_device *dev)
{ {
return netdev_priv(dev); struct nr_private *nr = netdev_priv(dev);
return &nr->stats;
} }
void nr_setup(struct net_device *dev) void nr_setup(struct net_device *dev)