Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-drm-fsl-dcu.git] / net / atm / lec.h

diff --git a/net/atm/lec.h b/net/atm/lec.h
index 877f509396968df536bdd76c130f28fbff502dbe..99136babd5357a273a8c758b5d47116fc59d6dcf 100644 (file)
--- a/net/atm/lec.h
+++ b/net/atm/lec.h
@@ -14,14 +14,14 @@
 #define LEC_HEADER_LEN 16
 
 struct lecdatahdr_8023 {
-       unsigned short le_header;
+       __be16 le_header;
        unsigned char h_dest[ETH_ALEN];
        unsigned char h_source[ETH_ALEN];
-       unsigned short h_type;
+       __be16 h_type;
 };
 
 struct lecdatahdr_8025 {
-       unsigned short le_header;
+       __be16 le_header;
        unsigned char ac_pad;
        unsigned char fc;
        unsigned char h_dest[ETH_ALEN];
@@ -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