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

Conflicts:
	include/linux/if_pppox.h

Fix conflict between Changli's __packed header file fixes and
the new PPTP driver.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 5 insertions, 5 deletions

diff --git a/include/linux/if_pppox.h b/include/linux/if_pppox.h
index 770e8fa669d2..29bcd55851eb 100644
--- a/include/linux/if_pppox.h
+++ b/include/linux/if_pppox.h
@@ -69,7 +69,7 @@ struct sockaddr_pppox {
                 struct pppoe_addr  pppoe;
                 struct pptp_addr   pptp;
         } sa_addr;
-} __packed;
+} __attribute__((packed));
 
 /* The use of the above union isn't viable because the size of this
  * struct must stay fixed over time -- applications use sizeof(struct
@@ -80,7 +80,7 @@ struct sockaddr_pppol2tp {
         sa_family_t     sa_family;      /* address family, AF_PPPOX */
         unsigned int    sa_protocol;    /* protocol identifier */
         struct pppol2tp_addr pppol2tp;
-} __packed;
+} __attribute__((packed));
 
 /* The L2TPv3 protocol changes tunnel and session ids from 16 to 32
  * bits. So we need a different sockaddr structure.
@@ -89,7 +89,7 @@ struct sockaddr_pppol2tpv3 {
         sa_family_t     sa_family;      /* address family, AF_PPPOX */
         unsigned int    sa_protocol;    /* protocol identifier */
         struct pppol2tpv3_addr pppol2tp;
-} __packed;
+} __attribute__((packed));
 
 /*********************************************************************
  *
@@ -111,7 +111,7 @@ struct pppoe_tag {
         __be16 tag_type;
         __be16 tag_len;
         char tag_data[0];
-} __packed;
+} __attribute__ ((packed));
 
 /* Tag identifiers */
 #define PTT_EOL         __cpu_to_be16(0x0000)
@@ -139,7 +139,7 @@ struct pppoe_hdr {
         __be16 sid;
         __be16 length;
         struct pppoe_tag tag[0];
-} __packed;
+} __attribute__((packed));
 
 /* Length of entire PPPoE + PPP header */
 #define PPPOE_SES_HLEN  8