From: David S. Miller <davem@davemloft.net>
Date: Mon, 23 Aug 2010 05:37:04 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=2d4833aae65589ba4317dd325fe20c8b25c14173;p=mv-sheeva.git

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>
---

2d4833aae65589ba4317dd325fe20c8b25c14173
diff --cc include/linux/if_pppox.h
index 770e8fa669d,27741e05446..29bcd55851e
--- a/include/linux/if_pppox.h
+++ b/include/linux/if_pppox.h
@@@ -47,29 -47,19 +47,29 @@@ struct pppoe_addr 
  }; 
   
  /************************************************************************ 
 - * 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