diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-08 14:57:46 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-08 14:57:46 -0700 |
commit | dcbd39a1f1073b10debdb965fccc0ab806d59780 (patch) | |
tree | 9a1ea287985af6a896fd6a13cc6a1ecbc9d384ca /include/linux | |
parent | 582fd487611baa06b07665978429192390c29b8f (diff) | |
parent | 4f55cd105c38af4aa157804729d694f864fbc78a (diff) | |
download | linux-3.10-dcbd39a1f1073b10debdb965fccc0ab806d59780.tar.gz linux-3.10-dcbd39a1f1073b10debdb965fccc0ab806d59780.tar.bz2 linux-3.10-dcbd39a1f1073b10debdb965fccc0ab806d59780.zip |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/atmdev.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/linux/atmdev.h b/include/linux/atmdev.h index f1fd849e553..aca9b344bd3 100644 --- a/include/linux/atmdev.h +++ b/include/linux/atmdev.h @@ -76,6 +76,13 @@ struct atm_dev_stats { /* set interface ESI */ #define ATM_SETESIF _IOW('a',ATMIOC_ITF+13,struct atmif_sioc) /* force interface ESI */ +#define ATM_ADDLECSADDR _IOW('a', ATMIOC_ITF+14, struct atmif_sioc) + /* register a LECS address */ +#define ATM_DELLECSADDR _IOW('a', ATMIOC_ITF+15, struct atmif_sioc) + /* unregister a LECS address */ +#define ATM_GETLECSADDR _IOW('a', ATMIOC_ITF+16, struct atmif_sioc) + /* retrieve LECS address(es) */ + #define ATM_GETSTAT _IOW('a',ATMIOC_SARCOM+0,struct atmif_sioc) /* get AAL layer statistics */ #define ATM_GETSTATZ _IOW('a',ATMIOC_SARCOM+1,struct atmif_sioc) @@ -328,6 +335,8 @@ struct atm_dev_addr { struct list_head entry; /* next address */ }; +enum atm_addr_type_t { ATM_ADDR_LOCAL, ATM_ADDR_LECS }; + struct atm_dev { const struct atmdev_ops *ops; /* device operations; NULL if unused */ const struct atmphy_ops *phy; /* PHY operations, may be undefined */ @@ -338,6 +347,7 @@ struct atm_dev { void *phy_data; /* private PHY date */ unsigned long flags; /* device flags (ATM_DF_*) */ struct list_head local; /* local ATM addresses */ + struct list_head lecs; /* LECS ATM addresses learned via ILMI */ unsigned char esi[ESI_LEN]; /* ESI ("MAC" addr) */ struct atm_cirange ci_range; /* VPI/VCI range */ struct k_atm_dev_stats stats; /* statistics */ |