header: fix broken headers for user space
__packed is only defined in kernel space, so we should use __attribute__((packed)) for the code shared between kernel and user space. Two __attribute() annotations are replaced with __attribute__() too. Signed-off-by: Changli Gao <xiaosuo@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:

committed by
David S. Miller

parent
48d3ff8269
commit
09cd2b99c6
@@ -59,7 +59,7 @@ struct sockaddr_pppox {
|
||||
union{
|
||||
struct pppoe_addr pppoe;
|
||||
}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
|
||||
@@ -70,7 +70,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.
|
||||
@@ -79,7 +79,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));
|
||||
|
||||
/*********************************************************************
|
||||
*
|
||||
@@ -101,7 +101,7 @@ struct pppoe_tag {
|
||||
__be16 tag_type;
|
||||
__be16 tag_len;
|
||||
char tag_data[0];
|
||||
} __attribute ((packed));
|
||||
} __attribute__ ((packed));
|
||||
|
||||
/* Tag identifiers */
|
||||
#define PTT_EOL __cpu_to_be16(0x0000)
|
||||
@@ -129,7 +129,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
|
||||
|
Reference in New Issue
Block a user