git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
net
/
llc
/
af_llc.c
diff --git
a/net/llc/af_llc.c
b/net/llc/af_llc.c
index
5a04db7
..
8171c53
100644
(file)
--- 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);
*
* 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 ?
htons(ETH_P_TR_802_2) : htons(ETH_P_802_2);
{
return arphrd == ARPHRD_IEEE802_TR ?
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
* @addr: Address to test if null.
*/
* llc_ui_addr_null - determines if a address structure is 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,7
+89,8
@@
static inline u8 llc_ui_addr_null(struct sockaddr_llc *addr)
* operation the user would like to perform and the type of socket.
* Returns the correct llc header length.
*/
* operation the user would like to perform and the type of socket.
* Returns the correct llc header length.
*/
-static inline u8 llc_ui_header_len(struct sock *sk, struct sockaddr_llc *addr)
+static __inline__ u8 llc_ui_header_len(struct sock *sk,
+ struct sockaddr_llc *addr)
{
u8 rc = LLC_PDU_LEN_U;
{
u8 rc = LLC_PDU_LEN_U;
@@
-137,7
+138,7
@@
static void llc_ui_sk_init(struct socket *sock, struct sock *sk)
}
static struct proto llc_proto = {
}
static struct proto llc_proto = {
- .name = "
LLC
",
+ .name = "
DDP
",
.owner = THIS_MODULE,
.obj_size = sizeof(struct llc_sock),
};
.owner = THIS_MODULE,
.obj_size = sizeof(struct llc_sock),
};
@@
-187,10
+188,8
@@
static int llc_ui_release(struct socket *sock)
llc->laddr.lsap, llc->daddr.lsap);
if (!llc_send_disc(sk))
llc_ui_wait_for_disc(sk, sk->sk_rcvtimeo);
llc->laddr.lsap, llc->daddr.lsap);
if (!llc_send_disc(sk))
llc_ui_wait_for_disc(sk, sk->sk_rcvtimeo);
- if (!sock_flag(sk, SOCK_ZAPPED)) {
- llc_sap_put(llc->sap);
+ if (!sock_flag(sk, SOCK_ZAPPED))
llc_sap_remove_socket(llc->sap, sk);
llc_sap_remove_socket(llc->sap, sk);
- }
release_sock(sk);
if (llc->dev)
dev_put(llc->dev);
release_sock(sk);
if (llc->dev)
dev_put(llc->dev);