Merge branch 'linus' into x86/urgent

[linux-2.6-omap-h63xx.git] / include / net / atmclip.h

diff --git a/include/net/atmclip.h b/include/net/atmclip.h
index 90fcc98e676f349239b66d9a6840502fcb0e33f0..467c531b8a7ef84cc2610eb78ebb137799135ec2 100644 (file)
--- a/include/net/atmclip.h
+++ b/include/net/atmclip.h
@@ -36,7 +36,7 @@ struct clip_vcc {
 
 
 struct atmarp_entry {
-       u32             ip;             /* IP address */
+       __be32          ip;             /* IP address */
        struct clip_vcc *vccs;          /* active VCCs; NULL if resolution is
                                           pending */
        unsigned long   expires;        /* entry expiration time */
@@ -50,7 +50,6 @@ struct atmarp_entry {
 struct clip_priv {
        int number;                     /* for convenience ... */
        spinlock_t xoff_lock;           /* ensures that pop is atomic (SMP) */
-       struct net_device_stats stats;
        struct net_device *next;        /* next CLIP interface */
 };