summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorKai Germaschewski <kai@tp1.ruhr-uni-bochum.de>2002-09-29 07:10:26 -0500
committerKai Germaschewski <kai@tp1.ruhr-uni-bochum.de>2002-09-29 07:10:26 -0500
commit3814794a39aeb1fffae65a18d8b6fc30df9f5ad5 (patch)
tree5a1aeac92bf401ba8784f74249bc86dec8e48ecb /include/linux
parent1a5f681bed7a48e9541ec585accc8b6b5b20aee3 (diff)
ISDN: Move "name" member from isdn_net_local to isdn_net_dev
This is the first step of a long series moving members between isdn_net_local and isdn_net_dev. Today, a one-to-one relationship between these both structures exist, so it does not really matter where the members live. However, the goal is to get a correspondence like net_device -> isdn_net_local -> master isdn_net_device | slave isdn_net_device | slave isdn_net_device where more than one isdn_net_device can exist per actual net_device, due to channel bundling.
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/isdn.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/isdn.h b/include/linux/isdn.h
index bf9c6dd6f834..e8d6ac0e68d3 100644
--- a/include/linux/isdn.h
+++ b/include/linux/isdn.h
@@ -311,7 +311,6 @@ struct isdn_netif_ops {
typedef struct isdn_net_local_s {
spinlock_t lock;
ulong magic;
- char name[10]; /* Name of device */
struct timer_list dial_timer; /* dial events timer */
int dial_event; /* event in case of timer expiry */
struct net_device_stats stats; /* Ethernet Statistics */
@@ -410,6 +409,7 @@ typedef struct isdn_net_dev_s {
channels, which are currently
online */
spinlock_t queue_lock; /* lock to protect queue */
+ char name[10]; /* Name of device */
struct list_head global_list; /* global list of all isdn_net_devs */
struct net_device dev; /* interface to upper levels */
#ifdef CONFIG_ISDN_PPP