Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: James Chapman <jchapman@katalix.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

James Chapman and committed by
David S. Miller
9d4ec1ae c8657fd5

+6 -6
+6 -6
include/linux/if_pppox.h
··· 70 70 struct pppoe_addr pppoe; 71 71 struct pptp_addr pptp; 72 72 } sa_addr; 73 - } __attribute__((packed)); 73 + } __packed; 74 74 75 75 /* The use of the above union isn't viable because the size of this 76 76 * struct must stay fixed over time -- applications use sizeof(struct ··· 81 81 __kernel_sa_family_t sa_family; /* address family, AF_PPPOX */ 82 82 unsigned int sa_protocol; /* protocol identifier */ 83 83 struct pppol2tp_addr pppol2tp; 84 - } __attribute__((packed)); 84 + } __packed; 85 85 86 86 struct sockaddr_pppol2tpin6 { 87 87 __kernel_sa_family_t sa_family; /* address family, AF_PPPOX */ 88 88 unsigned int sa_protocol; /* protocol identifier */ 89 89 struct pppol2tpin6_addr pppol2tp; 90 - } __attribute__((packed)); 90 + } __packed; 91 91 92 92 /* The L2TPv3 protocol changes tunnel and session ids from 16 to 32 93 93 * bits. So we need a different sockaddr structure. ··· 96 96 __kernel_sa_family_t sa_family; /* address family, AF_PPPOX */ 97 97 unsigned int sa_protocol; /* protocol identifier */ 98 98 struct pppol2tpv3_addr pppol2tp; 99 - } __attribute__((packed)); 99 + } __packed; 100 100 101 101 struct sockaddr_pppol2tpv3in6 { 102 102 __kernel_sa_family_t sa_family; /* address family, AF_PPPOX */ 103 103 unsigned int sa_protocol; /* protocol identifier */ 104 104 struct pppol2tpv3in6_addr pppol2tp; 105 - } __attribute__((packed)); 105 + } __packed; 106 106 107 107 /********************************************************************* 108 108 * ··· 152 152 __be16 sid; 153 153 __be16 length; 154 154 struct pppoe_tag tag[0]; 155 - } __attribute__((packed)); 155 + } __packed; 156 156 157 157 /* Length of entire PPPoE + PPP header */ 158 158 #define PPPOE_SES_HLEN 8