Commit 9d4ec1ae authored by James Chapman's avatar James Chapman Committed by David S. Miller
Browse files

pppox: Replace __attribute__((packed)) in if_pppox.h



Checkpatch warns about the use of __attribute__((packed)). So use the
recommended __packed syntax instead.
Signed-off-by: default avatarJames Chapman <jchapman@katalix.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c8657fd5
...@@ -70,7 +70,7 @@ struct sockaddr_pppox { ...@@ -70,7 +70,7 @@ struct sockaddr_pppox {
struct pppoe_addr pppoe; struct pppoe_addr pppoe;
struct pptp_addr pptp; struct pptp_addr pptp;
} sa_addr; } sa_addr;
} __attribute__((packed)); } __packed;
/* The use of the above union isn't viable because the size of this /* The use of the above union isn't viable because the size of this
* struct must stay fixed over time -- applications use sizeof(struct * struct must stay fixed over time -- applications use sizeof(struct
...@@ -81,13 +81,13 @@ struct sockaddr_pppol2tp { ...@@ -81,13 +81,13 @@ struct sockaddr_pppol2tp {
__kernel_sa_family_t sa_family; /* address family, AF_PPPOX */ __kernel_sa_family_t sa_family; /* address family, AF_PPPOX */
unsigned int sa_protocol; /* protocol identifier */ unsigned int sa_protocol; /* protocol identifier */
struct pppol2tp_addr pppol2tp; struct pppol2tp_addr pppol2tp;
} __attribute__((packed)); } __packed;
struct sockaddr_pppol2tpin6 { struct sockaddr_pppol2tpin6 {
__kernel_sa_family_t sa_family; /* address family, AF_PPPOX */ __kernel_sa_family_t sa_family; /* address family, AF_PPPOX */
unsigned int sa_protocol; /* protocol identifier */ unsigned int sa_protocol; /* protocol identifier */
struct pppol2tpin6_addr pppol2tp; struct pppol2tpin6_addr pppol2tp;
} __attribute__((packed)); } __packed;
/* The L2TPv3 protocol changes tunnel and session ids from 16 to 32 /* The L2TPv3 protocol changes tunnel and session ids from 16 to 32
* bits. So we need a different sockaddr structure. * bits. So we need a different sockaddr structure.
...@@ -96,13 +96,13 @@ struct sockaddr_pppol2tpv3 { ...@@ -96,13 +96,13 @@ struct sockaddr_pppol2tpv3 {
__kernel_sa_family_t sa_family; /* address family, AF_PPPOX */ __kernel_sa_family_t sa_family; /* address family, AF_PPPOX */
unsigned int sa_protocol; /* protocol identifier */ unsigned int sa_protocol; /* protocol identifier */
struct pppol2tpv3_addr pppol2tp; struct pppol2tpv3_addr pppol2tp;
} __attribute__((packed)); } __packed;
struct sockaddr_pppol2tpv3in6 { struct sockaddr_pppol2tpv3in6 {
__kernel_sa_family_t sa_family; /* address family, AF_PPPOX */ __kernel_sa_family_t sa_family; /* address family, AF_PPPOX */
unsigned int sa_protocol; /* protocol identifier */ unsigned int sa_protocol; /* protocol identifier */
struct pppol2tpv3in6_addr pppol2tp; struct pppol2tpv3in6_addr pppol2tp;
} __attribute__((packed)); } __packed;
/********************************************************************* /*********************************************************************
* *
...@@ -152,7 +152,7 @@ struct pppoe_hdr { ...@@ -152,7 +152,7 @@ struct pppoe_hdr {
__be16 sid; __be16 sid;
__be16 length; __be16 length;
struct pppoe_tag tag[0]; struct pppoe_tag tag[0];
} __attribute__((packed)); } __packed;
/* Length of entire PPPoE + PPP header */ /* Length of entire PPPoE + PPP header */
#define PPPOE_SES_HLEN 8 #define PPPOE_SES_HLEN 8
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment