Commit 2342c990 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo Committed by David S. Miller

[LLC]: Replace __inline__ with inline

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@mandriva.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9c005e01
...@@ -54,7 +54,7 @@ static int llc_ui_wait_for_busy_core(struct sock *sk, long timeout); ...@@ -54,7 +54,7 @@ static int llc_ui_wait_for_busy_core(struct sock *sk, long timeout);
* *
* Return the next unused link number for a given sap. * Return the next unused link number for a given sap.
*/ */
static __inline__ u16 llc_ui_next_link_no(int sap) static inline u16 llc_ui_next_link_no(int sap)
{ {
return llc_ui_sap_link_no_max[sap]++; return llc_ui_sap_link_no_max[sap]++;
} }
...@@ -65,7 +65,7 @@ static __inline__ u16 llc_ui_next_link_no(int sap) ...@@ -65,7 +65,7 @@ static __inline__ u16 llc_ui_next_link_no(int sap)
* *
* Given an ARP header type return the corresponding ethernet protocol. * Given an ARP header type return the corresponding ethernet protocol.
*/ */
static __inline__ u16 llc_proto_type(u16 arphrd) static inline u16 llc_proto_type(u16 arphrd)
{ {
return arphrd == ARPHRD_IEEE802_TR ? return arphrd == ARPHRD_IEEE802_TR ?
htons(ETH_P_TR_802_2) : htons(ETH_P_802_2); htons(ETH_P_TR_802_2) : htons(ETH_P_802_2);
...@@ -75,7 +75,7 @@ static __inline__ u16 llc_proto_type(u16 arphrd) ...@@ -75,7 +75,7 @@ static __inline__ u16 llc_proto_type(u16 arphrd)
* llc_ui_addr_null - determines if a address structure is null * llc_ui_addr_null - determines if a address structure is null
* @addr: Address to test if null. * @addr: Address to test if null.
*/ */
static __inline__ u8 llc_ui_addr_null(struct sockaddr_llc *addr) static inline u8 llc_ui_addr_null(struct sockaddr_llc *addr)
{ {
return !memcmp(addr, &llc_ui_addrnull, sizeof(*addr)); return !memcmp(addr, &llc_ui_addrnull, sizeof(*addr));
} }
...@@ -89,8 +89,7 @@ static __inline__ u8 llc_ui_addr_null(struct sockaddr_llc *addr) ...@@ -89,8 +89,7 @@ static __inline__ u8 llc_ui_addr_null(struct sockaddr_llc *addr)
* operation the user would like to perform and the type of socket. * operation the user would like to perform and the type of socket.
* Returns the correct llc header length. * Returns the correct llc header length.
*/ */
static __inline__ u8 llc_ui_header_len(struct sock *sk, static inline u8 llc_ui_header_len(struct sock *sk, struct sockaddr_llc *addr)
struct sockaddr_llc *addr)
{ {
u8 rc = LLC_PDU_LEN_U; u8 rc = LLC_PDU_LEN_U;
......
Markdown is supported
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