Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2d4833aa authored by David S. Miller's avatar David S. Miller
Browse files

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: default avatarDavid S. Miller <davem@davemloft.net>
parents f3c58ace 6a6d01d3

drivers/isdn/hardware/avm/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -36,12 +36,13 @@ config ISDN_DRV_AVMB1_T1ISA 


config ISDN_DRV_AVMB1_B1PCMCIA

	tristate "AVM B1/M1/M2 PCMCIA support"

	depends on PCMCIA

	help

	  Enable support for the PCMCIA version of the AVM B1 card.



config ISDN_DRV_AVMB1_AVM_CS

	tristate "AVM B1/M1/M2 PCMCIA cs module"

	depends on ISDN_DRV_AVMB1_B1PCMCIA && PCMCIA

	depends on ISDN_DRV_AVMB1_B1PCMCIA

	help

	  Enable the PCMCIA client driver for the AVM B1/M1/M2

	  PCMCIA cards.

include/linux/if_ether.h

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ struct ethhdr { 
	unsigned char	h_dest[ETH_ALEN];	/* destination eth addr	*/

	unsigned char	h_source[ETH_ALEN];	/* source ether addr	*/

	__be16		h_proto;		/* packet type ID field	*/

} __packed;

} __attribute__((packed));



#ifdef __KERNEL__

#include <linux/skbuff.h>

include/linux/if_fddi.h

+4 −4
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ struct fddi_8022_1_hdr { 
	__u8	dsap;					/* destination service access point */

	__u8	ssap;					/* source service access point */

	__u8	ctrl;					/* control byte #1 */

} __packed;

} __attribute__((packed));



/* Define 802.2 Type 2 header */

struct fddi_8022_2_hdr {
@@ -75,7 +75,7 @@ struct fddi_8022_2_hdr { 
	__u8	ssap;					/* source service access point */

	__u8	ctrl_1;					/* control byte #1 */

	__u8	ctrl_2;					/* control byte #2 */

} __packed;

} __attribute__((packed));



/* Define 802.2 SNAP header */

#define FDDI_K_OUI_LEN	3
@@ -85,7 +85,7 @@ struct fddi_snap_hdr { 
	__u8	ctrl;					/* always 0x03 */

	__u8	oui[FDDI_K_OUI_LEN];	/* organizational universal id */

	__be16	ethertype;				/* packet type ID field */

} __packed;

} __attribute__((packed));



/* Define FDDI LLC frame header */

struct fddihdr {
@@ -98,7 +98,7 @@ struct fddihdr { 
		struct fddi_8022_2_hdr		llc_8022_2;

		struct fddi_snap_hdr		llc_snap;

		} hdr;

} __packed;

} __attribute__((packed));



#ifdef __KERNEL__

#include <linux/netdevice.h>

include/linux/if_hippi.h

+4 −4
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ struct hippi_fp_hdr { 
	__be32		fixed;

#endif

	__be32		d2_size;

} __packed;

} __attribute__((packed));



struct hippi_le_hdr {

#if defined (__BIG_ENDIAN_BITFIELD)
@@ -129,7 +129,7 @@ struct hippi_le_hdr { 
	__u8		daddr[HIPPI_ALEN];

	__u16		locally_administered;

	__u8		saddr[HIPPI_ALEN];

} __packed;

} __attribute__((packed));



#define HIPPI_OUI_LEN	3

/*
@@ -142,12 +142,12 @@ struct hippi_snap_hdr { 
	__u8	ctrl;			/* always 0x03 */

	__u8	oui[HIPPI_OUI_LEN];	/* organizational universal id (zero)*/

	__be16	ethertype;		/* packet type ID field */

} __packed;

} __attribute__((packed));



struct hippi_hdr {

	struct hippi_fp_hdr	fp;

	struct hippi_le_hdr	le;

	struct hippi_snap_hdr	snap;

} __packed;

} __attribute__((packed));



#endif	/* _LINUX_IF_HIPPI_H */

include/linux/if_pppox.h

+5 −5
Original line number Diff line number Diff line
@@ -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