Skip to content

L
linux
Commit ee9c88f2 authored by Joe Perches's avatar Joe Perches Committed by David S. Miller
Browse files
Options

af_econet: Use current logging styles and neatening 

Use pr_fmt() without KBUILD_MODNAME to allow AUN and econet prefixes.
Convert printks with KERN_DEBUG to pr_debug.
Hoist assigns from if.
80 column wrapping.
Move open braces to end of line.
Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2a49e001
Show whitespace changes
Inline Side-by-side
Showing with 74 additions and 75 deletions
net/econet/af_econet.c
View file @ ee9c88f2
...@@ -9,6 +9,8 @@ ...@@ -9,6 +9,8 @@
* *
*/ */
#define pr_fmt(fmt) fmt
#include <linux/module.h> #include <linux/module.h>
#include <linux/types.h> #include <linux/types.h>
...@@ -44,7 +46,7 @@ ...@@ -44,7 +46,7 @@
#include <linux/bitops.h> #include <linux/bitops.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <asm/uaccess.h> #include <linux/uaccess.h>
#include <asm/system.h> #include <asm/system.h>
static const struct proto_ops econet_ops; static const struct proto_ops econet_ops;
...@@ -63,9 +65,7 @@ static DEFINE_SPINLOCK(aun_queue_lock); ...@@ -63,9 +65,7 @@ static DEFINE_SPINLOCK(aun_queue_lock);
static struct socket *udpsock; static struct socket *udpsock;
#define AUN_PORT 0x8000 #define AUN_PORT 0x8000
struct aunhdr {
struct aunhdr
{
unsigned char code; /* AUN magic protocol byte */ unsigned char code; /* AUN magic protocol byte */
unsigned char port; unsigned char port;
unsigned char cb; unsigned char cb;
...@@ -82,8 +82,7 @@ static struct timer_list ab_cleanup_timer; ...@@ -82,8 +82,7 @@ static struct timer_list ab_cleanup_timer;
#endif /* CONFIG_ECONET_AUNUDP */ #endif /* CONFIG_ECONET_AUNUDP */
/* Per-packet information */ /* Per-packet information */
struct ec_cb struct ec_cb {
{
struct sockaddr_ec sec; struct sockaddr_ec sec;
unsigned long cookie; /* Supplied by user. */ unsigned long cookie; /* Supplied by user. */
#ifdef CONFIG_ECONET_AUNUDP #ifdef CONFIG_ECONET_AUNUDP
...@@ -137,7 +136,7 @@ static int econet_recvmsg(struct kiocb *iocb, struct socket *sock, ...@@ -137,7 +136,7 @@ static int econet_recvmsg(struct kiocb *iocb, struct socket *sock,
* but then it will block. * but then it will block.
*/ */
skb=skb_recv_datagram(sk,flags,flags&MSG_DONTWAIT,&err); skb = skb_recv_datagram(sk, flags, flags & MSG_DONTWAIT, &err);
/* /*
* An error occurred so return it. Because skb_recv_datagram() * An error occurred so return it. Because skb_recv_datagram()
...@@ -145,7 +144,7 @@ static int econet_recvmsg(struct kiocb *iocb, struct socket *sock, ...@@ -145,7 +144,7 @@ static int econet_recvmsg(struct kiocb *iocb, struct socket *sock,
* retries. * retries.
*/ */
if(skb==NULL) if (skb == NULL)
goto out; goto out;
/* /*
...@@ -154,10 +153,9 @@ static int econet_recvmsg(struct kiocb *iocb, struct socket *sock, ...@@ -154,10 +153,9 @@ static int econet_recvmsg(struct kiocb *iocb, struct socket *sock,
*/ */
copied = skb->len; copied = skb->len;
if (copied > len) if (copied > len) {
{ copied = len;
copied=len; msg->msg_flags |= MSG_TRUNC;
msg->msg_flags|=MSG_TRUNC;
} }
/* We can't use skb_copy_datagram here */ /* We can't use skb_copy_datagram here */
...@@ -186,7 +184,8 @@ static int econet_recvmsg(struct kiocb *iocb, struct socket *sock, ...@@ -186,7 +184,8 @@ static int econet_recvmsg(struct kiocb *iocb, struct socket *sock,
* Bind an Econet socket. * Bind an Econet socket.
*/ */
static int econet_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) static int econet_bind(struct socket *sock, struct sockaddr *uaddr,
int addr_len)
{ {
struct sockaddr_ec *sec = (struct sockaddr_ec *)uaddr; struct sockaddr_ec *sec = (struct sockaddr_ec *)uaddr;
struct sock *sk; struct sock *sk;
...@@ -226,9 +225,8 @@ static void tx_result(struct sock *sk, unsigned long cookie, int result) ...@@ -226,9 +225,8 @@ static void tx_result(struct sock *sk, unsigned long cookie, int result)
struct ec_cb *eb; struct ec_cb *eb;
struct sockaddr_ec *sec; struct sockaddr_ec *sec;
if (skb == NULL) if (skb == NULL) {
{ pr_debug("econet: memory squeeze, transmit result dropped\n");
printk(KERN_DEBUG "ec: memory squeeze, transmit result dropped.\n");
return; return;
} }
...@@ -265,7 +263,7 @@ static void ec_tx_done(struct sk_buff *skb, int result) ...@@ -265,7 +263,7 @@ static void ec_tx_done(struct sk_buff *skb, int result)
static int econet_sendmsg(struct kiocb *iocb, struct socket *sock, static int econet_sendmsg(struct kiocb *iocb, struct socket *sock,
struct msghdr *msg, size_t len) struct msghdr *msg, size_t len)
{ {
struct sockaddr_ec *saddr=(struct sockaddr_ec *)msg->msg_name; struct sockaddr_ec *saddr = (struct sockaddr_ec *)msg->msg_name;
struct net_device *dev; struct net_device *dev;
struct ec_addr addr; struct ec_addr addr;
int err; int err;
...@@ -333,9 +331,9 @@ static int econet_sendmsg(struct kiocb *iocb, struct socket *sock, ...@@ -333,9 +331,9 @@ static int econet_sendmsg(struct kiocb *iocb, struct socket *sock,
dev_hold(dev); dev_hold(dev);
skb = sock_alloc_send_skb(sk, len+LL_ALLOCATED_SPACE(dev), skb = sock_alloc_send_skb(sk, len + LL_ALLOCATED_SPACE(dev),
msg->msg_flags & MSG_DONTWAIT, &err); msg->msg_flags & MSG_DONTWAIT, &err);
if (skb==NULL) if (skb == NULL)
goto out_unlock; goto out_unlock;
skb_reserve(skb, LL_RESERVED_SPACE(dev)); skb_reserve(skb, LL_RESERVED_SPACE(dev));
...@@ -355,7 +353,7 @@ static int econet_sendmsg(struct kiocb *iocb, struct socket *sock, ...@@ -355,7 +353,7 @@ static int econet_sendmsg(struct kiocb *iocb, struct socket *sock,
struct ec_framehdr *fh; struct ec_framehdr *fh;
/* Poke in our control byte and /* Poke in our control byte and
port number. Hack, hack. */ port number. Hack, hack. */
fh = (struct ec_framehdr *)(skb->data); fh = (struct ec_framehdr *)skb->data;
fh->cb = cb; fh->cb = cb;
fh->port = port; fh->port = port;
if (sock->type != SOCK_DGRAM) { if (sock->type != SOCK_DGRAM) {
...@@ -365,7 +363,7 @@ static int econet_sendmsg(struct kiocb *iocb, struct socket *sock, ...@@ -365,7 +363,7 @@ static int econet_sendmsg(struct kiocb *iocb, struct socket *sock,
} }
/* Copy the data. Returns -EFAULT on error */ /* Copy the data. Returns -EFAULT on error */
err = memcpy_fromiovec(skb_put(skb,len), msg->msg_iov, len); err = memcpy_fromiovec(skb_put(skb, len), msg->msg_iov, len);
skb->protocol = proto; skb->protocol = proto;
skb->dev = dev; skb->dev = dev;
skb->priority = sk->sk_priority; skb->priority = sk->sk_priority;
...@@ -385,9 +383,9 @@ static int econet_sendmsg(struct kiocb *iocb, struct socket *sock, ...@@ -385,9 +383,9 @@ static int econet_sendmsg(struct kiocb *iocb, struct socket *sock,
mutex_unlock(&econet_mutex); mutex_unlock(&econet_mutex);
return len; return len;
out_free: out_free:
kfree_skb(skb); kfree_skb(skb);
out_unlock: out_unlock:
if (dev) if (dev)
dev_put(dev); dev_put(dev);
#else #else
...@@ -458,15 +456,14 @@ static int econet_sendmsg(struct kiocb *iocb, struct socket *sock, ...@@ -458,15 +456,14 @@ static int econet_sendmsg(struct kiocb *iocb, struct socket *sock,
goto error_free_buf; goto error_free_buf;
/* Get a skbuff (no data, just holds our cb information) */ /* Get a skbuff (no data, just holds our cb information) */
if ((skb = sock_alloc_send_skb(sk, 0, skb = sock_alloc_send_skb(sk, 0, msg->msg_flags & MSG_DONTWAIT, &err);
msg->msg_flags & MSG_DONTWAIT, if (skb == NULL)
&err)) == NULL)
goto error_free_buf; goto error_free_buf;
eb = (struct ec_cb *)&skb->cb; eb = (struct ec_cb *)&skb->cb;
eb->cookie = saddr->cookie; eb->cookie = saddr->cookie;
eb->timeout = (5*HZ); eb->timeout = 5 * HZ;
eb->start = jiffies; eb->start = jiffies;
ah.handle = aun_seq; ah.handle = aun_seq;
eb->seq = (aun_seq++); eb->seq = (aun_seq++);
...@@ -480,9 +477,10 @@ static int econet_sendmsg(struct kiocb *iocb, struct socket *sock, ...@@ -480,9 +477,10 @@ static int econet_sendmsg(struct kiocb *iocb, struct socket *sock,
udpmsg.msg_iovlen = 2; udpmsg.msg_iovlen = 2;
udpmsg.msg_control = NULL; udpmsg.msg_control = NULL;
udpmsg.msg_controllen = 0; udpmsg.msg_controllen = 0;
udpmsg.msg_flags=0; udpmsg.msg_flags = 0;
oldfs = get_fs(); set_fs(KERNEL_DS); /* More privs :-) */ oldfs = get_fs();
set_fs(KERNEL_DS); /* More privs :-) */
err = sock_sendmsg(udpsock, &udpmsg, size); err = sock_sendmsg(udpsock, &udpmsg, size);
set_fs(oldfs); set_fs(oldfs);
...@@ -530,7 +528,7 @@ static int econet_getname(struct socket *sock, struct sockaddr *uaddr, ...@@ -530,7 +528,7 @@ static int econet_getname(struct socket *sock, struct sockaddr *uaddr,
static void econet_destroy_timer(unsigned long data) static void econet_destroy_timer(unsigned long data)
{ {
struct sock *sk=(struct sock *)data; struct sock *sk = (struct sock *)data;
if (!sk_has_allocations(sk)) { if (!sk_has_allocations(sk)) {
sk_free(sk); sk_free(sk);
...@@ -539,7 +537,7 @@ static void econet_destroy_timer(unsigned long data) ...@@ -539,7 +537,7 @@ static void econet_destroy_timer(unsigned long data)
sk->sk_timer.expires = jiffies + 10 * HZ; sk->sk_timer.expires = jiffies + 10 * HZ;
add_timer(&sk->sk_timer); add_timer(&sk->sk_timer);
printk(KERN_DEBUG "econet socket destroy delayed\n"); pr_debug("econet: socket destroy delayed\n");
} }
/* /*
...@@ -651,7 +649,8 @@ static int ec_dev_ioctl(struct socket *sock, unsigned int cmd, void __user *arg) ...@@ -651,7 +649,8 @@ static int ec_dev_ioctl(struct socket *sock, unsigned int cmd, void __user *arg)
if (copy_from_user(&ifr, arg, sizeof(struct ifreq))) if (copy_from_user(&ifr, arg, sizeof(struct ifreq)))
return -EFAULT; return -EFAULT;
if ((dev = dev_get_by_name(&init_net, ifr.ifr_name)) == NULL) dev = dev_get_by_name(&init_net, ifr.ifr_name);
if (dev == NULL)
return -ENODEV; return -ENODEV;
sec = (struct sockaddr_ec *)&ifr.ifr_addr; sec = (struct sockaddr_ec *)&ifr.ifr_addr;
...@@ -715,7 +714,8 @@ static int ec_dev_ioctl(struct socket *sock, unsigned int cmd, void __user *arg) ...@@ -715,7 +714,8 @@ static int ec_dev_ioctl(struct socket *sock, unsigned int cmd, void __user *arg)
* Handle generic ioctls * Handle generic ioctls
*/ */
static int econet_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) static int econet_ioctl(struct socket *sock, unsigned int cmd,
unsigned long arg)
{ {
struct sock *sk = sock->sk; struct sock *sk = sock->sk;
void __user *argp = (void __user *)arg; void __user *argp = (void __user *)arg;
...@@ -833,7 +833,7 @@ static void aun_send_response(__u32 addr, unsigned long seq, int code, int cb) ...@@ -833,7 +833,7 @@ static void aun_send_response(__u32 addr, unsigned long seq, int code, int cb)
udpmsg.msg_namelen = sizeof(sin); udpmsg.msg_namelen = sizeof(sin);
udpmsg.msg_control = NULL; udpmsg.msg_control = NULL;
udpmsg.msg_controllen = 0; udpmsg.msg_controllen = 0;
udpmsg.msg_flags=0; udpmsg.msg_flags = 0;
kernel_sendmsg(udpsock, &udpmsg, &iov, 1, sizeof(ah)); kernel_sendmsg(udpsock, &udpmsg, &iov, 1, sizeof(ah));
} }
...@@ -856,26 +856,25 @@ static void aun_incoming(struct sk_buff *skb, struct aunhdr *ah, size_t len) ...@@ -856,26 +856,25 @@ static void aun_incoming(struct sk_buff *skb, struct aunhdr *ah, size_t len)
if (dst) if (dst)
edev = dst->dev->ec_ptr; edev = dst->dev->ec_ptr;
if (! edev) if (!edev)
goto bad; goto bad;
if ((sk = ec_listening_socket(ah->port, stn, edev->net)) == NULL) sk = ec_listening_socket(ah->port, stn, edev->net);
if (sk == NULL)
goto bad; /* Nobody wants it */ goto bad; /* Nobody wants it */
newskb = alloc_skb((len - sizeof(struct aunhdr) + 15) & ~15, newskb = alloc_skb((len - sizeof(struct aunhdr) + 15) & ~15,
GFP_ATOMIC); GFP_ATOMIC);
if (newskb == NULL) if (newskb == NULL) {
{ pr_debug("AUN: memory squeeze, dropping packet\n");
printk(KERN_DEBUG "AUN: memory squeeze, dropping packet.\n");
/* Send nack and hope sender tries again */ /* Send nack and hope sender tries again */
goto bad; goto bad;
} }
memcpy(skb_put(newskb, len - sizeof(struct aunhdr)), (void *)(ah+1), memcpy(skb_put(newskb, len - sizeof(struct aunhdr)), (void *)(ah + 1),
len - sizeof(struct aunhdr)); len - sizeof(struct aunhdr));
if (ec_queue_packet(sk, newskb, stn, edev->net, ah->cb, ah->port)) if (ec_queue_packet(sk, newskb, stn, edev->net, ah->cb, ah->port)) {
{
/* Socket is bankrupt. */ /* Socket is bankrupt. */
kfree_skb(newskb); kfree_skb(newskb);
goto bad; goto bad;
...@@ -911,7 +910,7 @@ static void aun_tx_ack(unsigned long seq, int result) ...@@ -911,7 +910,7 @@ static void aun_tx_ack(unsigned long seq, int result)
goto foundit; goto foundit;
} }
spin_unlock_irqrestore(&aun_queue_lock, flags); spin_unlock_irqrestore(&aun_queue_lock, flags);
printk(KERN_DEBUG "AUN: unknown sequence %ld\n", seq); pr_debug("AUN: unknown sequence %ld\n", seq);
return; return;
foundit: foundit:
...@@ -936,18 +935,17 @@ static void aun_data_available(struct sock *sk, int slen) ...@@ -936,18 +935,17 @@ static void aun_data_available(struct sock *sk, int slen)
while ((skb = skb_recv_datagram(sk, 0, 1, &err)) == NULL) { while ((skb = skb_recv_datagram(sk, 0, 1, &err)) == NULL) {
if (err == -EAGAIN) { if (err == -EAGAIN) {
printk(KERN_ERR "AUN: no data available?!"); pr_err("AUN: no data available?!\n");
return; return;
} }
printk(KERN_DEBUG "AUN: recvfrom() error %d\n", -err); pr_debug("AUN: recvfrom() error %d\n", -err);
} }
data = skb_transport_header(skb) + sizeof(struct udphdr); data = skb_transport_header(skb) + sizeof(struct udphdr);
ah = (struct aunhdr *)data; ah = (struct aunhdr *)data;
len = skb->len - sizeof(struct udphdr); len = skb->len - sizeof(struct udphdr);
switch (ah->code) switch (ah->code) {
{
case 2: case 2:
aun_incoming(skb, ah, len); aun_incoming(skb, ah, len);
break; break;
...@@ -958,7 +956,7 @@ static void aun_data_available(struct sock *sk, int slen) ...@@ -958,7 +956,7 @@ static void aun_data_available(struct sock *sk, int slen)
aun_tx_ack(ah->handle, ECTYPE_TRANSMIT_NOT_LISTENING); aun_tx_ack(ah->handle, ECTYPE_TRANSMIT_NOT_LISTENING);
break; break;
default: default:
printk(KERN_DEBUG "unknown AUN packet (type %d)\n", data[0]); pr_debug("AUN: unknown packet type: %d\n", data[0]);
} }
skb_free_datagram(sk, skb); skb_free_datagram(sk, skb);
...@@ -988,7 +986,7 @@ static void ab_cleanup(unsigned long h) ...@@ -988,7 +986,7 @@ static void ab_cleanup(unsigned long h)
} }
spin_unlock_irqrestore(&aun_queue_lock, flags); spin_unlock_irqrestore(&aun_queue_lock, flags);
mod_timer(&ab_cleanup_timer, jiffies + (HZ*2)); mod_timer(&ab_cleanup_timer, jiffies + (HZ * 2));
} }
static int __init aun_udp_initialise(void) static int __init aun_udp_initialise(void)
...@@ -998,7 +996,7 @@ static int __init aun_udp_initialise(void) ...@@ -998,7 +996,7 @@ static int __init aun_udp_initialise(void)
skb_queue_head_init(&aun_queue); skb_queue_head_init(&aun_queue);
setup_timer(&ab_cleanup_timer, ab_cleanup, 0); setup_timer(&ab_cleanup_timer, ab_cleanup, 0);
ab_cleanup_timer.expires = jiffies + (HZ*2); ab_cleanup_timer.expires = jiffies + (HZ * 2);
add_timer(&ab_cleanup_timer); add_timer(&ab_cleanup_timer);
memset(&sin, 0, sizeof(sin)); memset(&sin, 0, sizeof(sin));
...@@ -1006,9 +1004,9 @@ static int __init aun_udp_initialise(void) ...@@ -1006,9 +1004,9 @@ static int __init aun_udp_initialise(void)
/* We can count ourselves lucky Acorn machines are too dim to /* We can count ourselves lucky Acorn machines are too dim to
speak IPv6. :-) */ speak IPv6. :-) */
if ((error = sock_create_kern(PF_INET, SOCK_DGRAM, 0, &udpsock)) < 0) error = sock_create_kern(PF_INET, SOCK_DGRAM, 0, &udpsock);
{ if (error < 0) {
printk("AUN: socket error %d\n", -error); pr_err("AUN: socket error %d\n", -error);
return error; return error;
} }
...@@ -1018,9 +1016,8 @@ static int __init aun_udp_initialise(void) ...@@ -1018,9 +1016,8 @@ static int __init aun_udp_initialise(void)
error = udpsock->ops->bind(udpsock, (struct sockaddr *)&sin, error = udpsock->ops->bind(udpsock, (struct sockaddr *)&sin,
sizeof(sin)); sizeof(sin));
if (error < 0) if (error < 0) {
{ pr_err("AUN: bind error %d\n", -error);
printk("AUN: bind error %d\n", -error);
goto release; goto release;
} }
...@@ -1041,7 +1038,8 @@ static int __init aun_udp_initialise(void) ...@@ -1041,7 +1038,8 @@ static int __init aun_udp_initialise(void)
* Receive an Econet frame from a device. * Receive an Econet frame from a device.
*/ */
static int econet_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt, struct net_device *orig_dev) static int econet_rcv(struct sk_buff *skb, struct net_device *dev,
struct packet_type *pt, struct net_device *orig_dev)
{ {
struct ec_framehdr *hdr; struct ec_framehdr *hdr;
struct sock *sk = NULL; struct sock *sk = NULL;
...@@ -1056,13 +1054,14 @@ static int econet_rcv(struct sk_buff *skb, struct net_device *dev, struct packet ...@@ -1056,13 +1054,14 @@ static int econet_rcv(struct sk_buff *skb, struct net_device *dev, struct packet
if (!edev) if (!edev)
goto drop; goto drop;
if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL) skb = skb_share_check(skb, GFP_ATOMIC);
if (skb == NULL)
return NET_RX_DROP; return NET_RX_DROP;
if (!pskb_may_pull(skb, sizeof(struct ec_framehdr))) if (!pskb_may_pull(skb, sizeof(struct ec_framehdr)))
goto drop; goto drop;
hdr = (struct ec_framehdr *) skb->data; hdr = (struct ec_framehdr *)skb->data;
/* First check for encapsulated IP */ /* First check for encapsulated IP */
if (hdr->port == EC_PORT_IP) { if (hdr->port == EC_PORT_IP) {
...@@ -1101,9 +1100,10 @@ static void econet_hw_initialise(void) ...@@ -1101,9 +1100,10 @@ static void econet_hw_initialise(void)
#endif #endif
static int econet_notifier(struct notifier_block *this, unsigned long msg, void *data) static int econet_notifier(struct notifier_block *this, unsigned long msg,
void *data)
{ {
struct net_device *dev = (struct net_device *)data; struct net_device *dev = data;
struct ec_device *edev; struct ec_device *edev;
if (!net_eq(dev_net(dev), &init_net)) if (!net_eq(dev_net(dev), &init_net))
...@@ -1113,8 +1113,7 @@ static int econet_notifier(struct notifier_block *this, unsigned long msg, void ...@@ -1113,8 +1113,7 @@ static int econet_notifier(struct notifier_block *this, unsigned long msg, void
case NETDEV_UNREGISTER: case NETDEV_UNREGISTER:
/* A device has gone down - kill any data we hold for it. */ /* A device has gone down - kill any data we hold for it. */
edev = dev->ec_ptr; edev = dev->ec_ptr;
if (edev) if (edev) {
{
if (net2dev_map[0] == dev) if (net2dev_map[0] == dev)
net2dev_map[0] = NULL; net2dev_map[0] = NULL;
net2dev_map[edev->net] = NULL; net2dev_map[edev->net] = NULL;
...@@ -1128,7 +1127,7 @@ static int econet_notifier(struct notifier_block *this, unsigned long msg, void ...@@ -1128,7 +1127,7 @@ static int econet_notifier(struct notifier_block *this, unsigned long msg, void
} }
static struct notifier_block econet_netdev_notifier = { static struct notifier_block econet_netdev_notifier = {
.notifier_call =econet_notifier, .notifier_call = econet_notifier,
}; };
static void __exit econet_proto_exit(void) static void __exit econet_proto_exit(void)
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7