aboutsummaryrefslogtreecommitdiffstats
path: root/net/llc
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@mandriva.com>2006-03-21 00:27:43 -0500
committerDavid S. Miller <davem@davemloft.net>2006-03-21 00:27:43 -0500
commit2342c990bbd2c075d627720006f0e602134346a7 (patch)
treeca72ae361e880aa1cd0cba5c3e01bc1a3cff17f7 /net/llc
parent9c005e018cd951699e371a06889c553f9f4d1478 (diff)
[LLC]: Replace __inline__ with inline
Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/llc')
-rw-r--r--net/llc/af_llc.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/net/llc/af_llc.c b/net/llc/af_llc.c
index 490b3b4f9f76..233794435bb8 100644
--- a/net/llc/af_llc.c
+++ b/net/llc/af_llc.c
@@ -54,7 +54,7 @@ static int llc_ui_wait_for_busy_core(struct sock *sk, long timeout);
54 * 54 *
55 * Return the next unused link number for a given sap. 55 * Return the next unused link number for a given sap.
56 */ 56 */
57static __inline__ u16 llc_ui_next_link_no(int sap) 57static inline u16 llc_ui_next_link_no(int sap)
58{ 58{
59 return llc_ui_sap_link_no_max[sap]++; 59 return llc_ui_sap_link_no_max[sap]++;
60} 60}
@@ -65,7 +65,7 @@ static __inline__ u16 llc_ui_next_link_no(int sap)
65 * 65 *
66 * Given an ARP header type return the corresponding ethernet protocol. 66 * Given an ARP header type return the corresponding ethernet protocol.
67 */ 67 */
68static __inline__ u16 llc_proto_type(u16 arphrd) 68static inline u16 llc_proto_type(u16 arphrd)
69{ 69{
70 return arphrd == ARPHRD_IEEE802_TR ? 70 return arphrd == ARPHRD_IEEE802_TR ?
71 htons(ETH_P_TR_802_2) : htons(ETH_P_802_2); 71 htons(ETH_P_TR_802_2) : htons(ETH_P_802_2);
@@ -75,7 +75,7 @@ static __inline__ u16 llc_proto_type(u16 arphrd)
75 * llc_ui_addr_null - determines if a address structure is null 75 * llc_ui_addr_null - determines if a address structure is null
76 * @addr: Address to test if null. 76 * @addr: Address to test if null.
77 */ 77 */
78static __inline__ u8 llc_ui_addr_null(struct sockaddr_llc *addr) 78static inline u8 llc_ui_addr_null(struct sockaddr_llc *addr)
79{ 79{
80 return !memcmp(addr, &llc_ui_addrnull, sizeof(*addr)); 80 return !memcmp(addr, &llc_ui_addrnull, sizeof(*addr));
81} 81}
@@ -89,8 +89,7 @@ static __inline__ u8 llc_ui_addr_null(struct sockaddr_llc *addr)
89 * operation the user would like to perform and the type of socket. 89 * operation the user would like to perform and the type of socket.
90 * Returns the correct llc header length. 90 * Returns the correct llc header length.
91 */ 91 */
92static __inline__ u8 llc_ui_header_len(struct sock *sk, 92static inline u8 llc_ui_header_len(struct sock *sk, struct sockaddr_llc *addr)
93 struct sockaddr_llc *addr)
94{ 93{
95 u8 rc = LLC_PDU_LEN_U; 94 u8 rc = LLC_PDU_LEN_U;
96 95