lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[LLC]: Replace __inline__ with inline

Browse Source 
Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Arnaldo Carvalho de Melo
2006-03-20 21:27:43 -08:00
committed by David S. Miller
parent 9c005e018c
commit 2342c990bb
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
net/llc/af_llc.c
View File

@@ -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)
* *
* 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)
* 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)
* 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;