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>

diff --combined include/linux/if_pppox.h
index 770e8fa669d260e96b9bb4b61877dc06301023df,27741e05446f97dfad3e5f35e83f328d02520588..29bcd55851ebed4dd2113965c2277f1e4c6bb9e6
--- 1/include/linux/if_pppox.h
--- 2/include/linux/if_pppox.h
+++ b/include/linux/if_pppox.h
@@@ -40,36 -40,26 +40,36 @@@
   * PPPoE addressing definition 
   */ 
  typedef __be16 sid_t;
 -struct pppoe_addr{ 
 -       sid_t           sid;                    /* Session identifier */ 
 -       unsigned char   remote[ETH_ALEN];       /* Remote address */ 
 -       char            dev[IFNAMSIZ];          /* Local device to use */ 
 +struct pppoe_addr {
 +      sid_t         sid;                    /* Session identifier */
 +      unsigned char remote[ETH_ALEN];       /* Remote address */
 +      char          dev[IFNAMSIZ];          /* Local device to use */
  }; 
   
  /************************************************************************ 
 - * Protocols supported by AF_PPPOX 
 - */ 
 + * PPTP addressing definition
 + */
 +struct pptp_addr {
 +      __be16          call_id;
 +      struct in_addr  sin_addr;
 +};
 +
 +/************************************************************************
 + * Protocols supported by AF_PPPOX
 + */
  #define PX_PROTO_OE    0 /* Currently just PPPoE */
  #define PX_PROTO_OL2TP 1 /* Now L2TP also */
 -#define PX_MAX_PROTO   2
 -
 -struct sockaddr_pppox { 
 -       sa_family_t     sa_family;            /* address family, AF_PPPOX */ 
 -       unsigned int    sa_protocol;          /* protocol identifier */ 
 -       union{ 
 -               struct pppoe_addr       pppoe; 
 -       }sa_addr; 
 +#define PX_PROTO_PPTP  2
 +#define PX_MAX_PROTO   3
 +
 +struct sockaddr_pppox {
 +      sa_family_t     sa_family;            /* address family, AF_PPPOX */
 +      unsigned int    sa_protocol;          /* protocol identifier */
 +      union {
 +              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 -70,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 -79,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 -101,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 -129,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
@@@ -160,23 -150,15 +160,23 @@@ struct pppoe_opt 
                                             relayed to (PPPoE relaying) */
  };
  
 +struct pptp_opt {
 +      struct pptp_addr src_addr;
 +      struct pptp_addr dst_addr;
 +      u32 ack_sent, ack_recv;
 +      u32 seq_sent, seq_recv;
 +      int ppp_flags;
 +};
  #include <net/sock.h>
  
  struct pppox_sock {
        /* struct sock must be the first member of pppox_sock */
 -      struct sock             sk;
 -      struct ppp_channel      chan;
 +      struct sock sk;
 +      struct ppp_channel chan;
        struct pppox_sock       *next;    /* for hash table */
        union {
                struct pppoe_opt pppoe;
 +              struct pptp_opt  pptp;
        } proto;
        __be16                  num;
  };