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

[NET] IPX: Fix whitespace errors.

Browse Source 
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
YOSHIFUJI Hideaki
2007-02-09 23:24:51 +09:00
committed by David S. Miller
parent 1ab1457c42
commit 981c0ff690
4 changed files with 46 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
net/ipx/af_ipx.c
View File

@@ -152,8 +152,8 @@ static void ipx_destroy_socket(struct sock *sk)
ipx_remove_socket(sk); ipx_remove_socket(sk);
skb_queue_purge(&sk->sk_receive_queue); skb_queue_purge(&sk->sk_receive_queue);
#ifdef IPX_REFCNT_DEBUG #ifdef IPX_REFCNT_DEBUG
atomic_dec(&ipx_sock_nr); atomic_dec(&ipx_sock_nr);
printk(KERN_DEBUG "IPX socket %p released, %d are still alive\n", sk, printk(KERN_DEBUG "IPX socket %p released, %d are still alive\n", sk,
atomic_read(&ipx_sock_nr)); atomic_read(&ipx_sock_nr));
if (atomic_read(&sk->sk_refcnt) != 1) if (atomic_read(&sk->sk_refcnt) != 1)
printk(KERN_DEBUG "Destruction sock ipx %p delayed, cnt=%d\n", printk(KERN_DEBUG "Destruction sock ipx %p delayed, cnt=%d\n",
@@ -446,10 +446,10 @@ static struct sock *ncp_connection_hack(struct ipx_interface *intrfc,
* You might call this a hack, but believe me, you do not want a * You might call this a hack, but believe me, you do not want a
* complete NCP layer in the kernel, and this is VERY fast as well. */ * complete NCP layer in the kernel, and this is VERY fast as well. */
struct sock *sk = NULL; struct sock *sk = NULL;
int connection = 0; int connection = 0;
u8 *ncphdr = (u8 *)(ipx + 1); u8 *ncphdr = (u8 *)(ipx + 1);
if (*ncphdr == 0x22 && *(ncphdr + 1) == 0x22) /* NCP request */ if (*ncphdr == 0x22 && *(ncphdr + 1) == 0x22) /* NCP request */
connection = (((int) *(ncphdr + 5)) << 8) | (int) *(ncphdr + 3); connection = (((int) *(ncphdr + 5)) << 8) | (int) *(ncphdr + 3);
else if (*ncphdr == 0x77 && *(ncphdr + 1) == 0x77) /* BURST packet */ else if (*ncphdr == 0x77 && *(ncphdr + 1) == 0x77) /* BURST packet */
connection = (((int) *(ncphdr + 9)) << 8) | (int) *(ncphdr + 8); connection = (((int) *(ncphdr + 9)) << 8) | (int) *(ncphdr + 8);
@@ -482,7 +482,7 @@ static int ipxitf_demux_socket(struct ipx_interface *intrfc,
if (intrfc == ipx_primary_net && ntohs(ipx->ipx_dest.sock) == 0x451) if (intrfc == ipx_primary_net && ntohs(ipx->ipx_dest.sock) == 0x451)
sock1 = ncp_connection_hack(intrfc, ipx); sock1 = ncp_connection_hack(intrfc, ipx);
if (!sock1) if (!sock1)
/* No special socket found, forward the packet the normal way */ /* No special socket found, forward the packet the normal way */
sock1 = ipxitf_find_socket(intrfc, ipx->ipx_dest.sock); sock1 = ipxitf_find_socket(intrfc, ipx->ipx_dest.sock);
@@ -709,7 +709,7 @@ static int ipxitf_rcv(struct ipx_interface *intrfc, struct sk_buff *skb)
/* See if we should update our network number */ /* See if we should update our network number */
if (!intrfc->if_netnum) /* net number of intrfc not known yet */ if (!intrfc->if_netnum) /* net number of intrfc not known yet */
ipxitf_discover_netnum(intrfc, skb); ipxitf_discover_netnum(intrfc, skb);
IPX_SKB_CB(skb)->last_hop.index = -1; IPX_SKB_CB(skb)->last_hop.index = -1;
if (ipx->ipx_type == IPX_TYPE_PPROP) { if (ipx->ipx_type == IPX_TYPE_PPROP) {
@@ -820,7 +820,7 @@ static int ipxitf_pprop(struct ipx_interface *intrfc, struct sk_buff *skb)
* tctrl <= 15, any data payload... */ * tctrl <= 15, any data payload... */
if (IPX_SKB_CB(skb)->ipx_tctrl > IPX_MAX_PPROP_HOPS || if (IPX_SKB_CB(skb)->ipx_tctrl > IPX_MAX_PPROP_HOPS ||
ntohs(ipx->ipx_pktsize) < sizeof(struct ipxhdr) + ntohs(ipx->ipx_pktsize) < sizeof(struct ipxhdr) +
IPX_MAX_PPROP_HOPS * sizeof(u32)) IPX_MAX_PPROP_HOPS * sizeof(u32))
goto out; goto out;
/* are we broadcasting this damn thing? */ /* are we broadcasting this damn thing? */
rc = 0; rc = 0;
@@ -1372,13 +1372,13 @@ static int ipx_create(struct socket *sock, int protocol)
if (sock->type != SOCK_DGRAM) if (sock->type != SOCK_DGRAM)
goto out; goto out;
rc = -ENOMEM; rc = -ENOMEM;
sk = sk_alloc(PF_IPX, GFP_KERNEL, &ipx_proto, 1); sk = sk_alloc(PF_IPX, GFP_KERNEL, &ipx_proto, 1);
if (!sk) if (!sk)
goto out; goto out;
#ifdef IPX_REFCNT_DEBUG #ifdef IPX_REFCNT_DEBUG
atomic_inc(&ipx_sock_nr); atomic_inc(&ipx_sock_nr);
printk(KERN_DEBUG "IPX socket %p created, now we have %d alive\n", sk, printk(KERN_DEBUG "IPX socket %p created, now we have %d alive\n", sk,
atomic_read(&ipx_sock_nr)); atomic_read(&ipx_sock_nr));
#endif #endif
sock_init_data(sock, sk); sock_init_data(sock, sk);
@@ -1561,7 +1561,7 @@ static int ipx_connect(struct socket *sock, struct sockaddr *uaddr,
goto out; goto out;
} }
/* We can either connect to primary network or somewhere /* We can either connect to primary network or somewhere
* we can route to */ * we can route to */
rt = ipxrtr_lookup(addr->sipx_network); rt = ipxrtr_lookup(addr->sipx_network);
rc = -ENETUNREACH; rc = -ENETUNREACH;
@@ -1643,8 +1643,8 @@ static int ipx_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_ty
int rc = 0; int rc = 0;
/* Not ours */ /* Not ours */
if (skb->pkt_type == PACKET_OTHERHOST) if (skb->pkt_type == PACKET_OTHERHOST)
goto drop; goto drop;
if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL) if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL)
goto out; goto out;
@@ -1875,8 +1875,8 @@ static int ipx_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
* This socket wants to take care of the NCP connection * This socket wants to take care of the NCP connection
* handed to us in arg. * handed to us in arg.
*/ */
rc = -EPERM; rc = -EPERM;
if (!capable(CAP_NET_ADMIN)) if (!capable(CAP_NET_ADMIN))
break; break;
rc = get_user(ipx_sk(sk)->ipx_ncp_conn, rc = get_user(ipx_sk(sk)->ipx_ncp_conn,
(const unsigned short __user *)argp); (const unsigned short __user *)argp);

2
net/ipx/sysctl_net_ipx.c
View File

@@ -34,7 +34,7 @@ static struct ctl_table ipx_dir_table[] = {
.procname = "ipx", .procname = "ipx",
.mode = 0555, .mode = 0555,
.child = ipx_table, .child = ipx_table,
}, },
{ 0 }, { 0 },
}; };