X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=net%2Fatm%2Flec.h;h=b41cda7ea1e183804121ab9f89ab48b935e306fd;hb=c62cf5cb173a5b8446e513a14448460cad435db2;hp=24cc95f86741bdb0728de9222e2297dedecb0879;hpb=651857a1ecaf97a8ad9d324dd2a61675c53e541e;p=~andy%2Flinux diff --git a/net/atm/lec.h b/net/atm/lec.h index 24cc95f8674..b41cda7ea1e 100644 --- a/net/atm/lec.h +++ b/net/atm/lec.h @@ -52,12 +52,12 @@ struct lane2_ops { /* * ATM LAN Emulation supports both LLC & Dix Ethernet EtherType - * frames. + * frames. * * 1. Dix Ethernet EtherType frames encoded by placing EtherType * field in h_type field. Data follows immediatelly after header. * 2. LLC Data frames whose total length, including LLC field and data, - * but not padding required to meet the minimum data frame length, + * but not padding required to meet the minimum data frame length, * is less than 1536(0x0600) MUST be encoded by placing that length * in the h_type field. The LLC field follows header immediatelly. * 3. LLC data frames longer than this maximum MUST be encoded by placing @@ -92,7 +92,7 @@ struct lec_priv { spinlock_t lec_arp_lock; struct atm_vcc *mcast_vcc; /* Default Multicast Send VCC */ struct atm_vcc *lecd; - struct work_struct lec_arp_work; /* C10 */ + struct delayed_work lec_arp_work; /* C10 */ unsigned int maximum_unknown_frame_count; /* * Within the period of time defined by this variable, the client will send