On Fri, 2006-01-20 at 17:44 -0800, Ben Greear wrote:
> Kris Katterjohn wrote:
> > This fixes some whitespace issues in af_packet.c
Perhaps this instead?
Whitespace
comment wrapping to < 80 columns
remove unnecessary assigns
remove unnecessary parentheses from returns
add KERN_INFO to printk
move 1 assign out of an if
Signed-off-by: Joe Perches <[EMAIL PROTECTED]>
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index ee93abc..2d9a862 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -241,7 +241,7 @@ static void packet_sock_destruct(struct
BUG_TRAP(!atomic_read(&sk->sk_wmem_alloc));
if (!sock_flag(sk, SOCK_DEAD)) {
- printk("Attempt to release alive packet socket: %p\n", sk);
+ printk(KERN_INFO "Attempt to release alive packet socket:
%p\n", sk);
return;
}
@@ -283,7 +283,8 @@ static int packet_rcv_spkt(struct sk_buf
if (skb->pkt_type == PACKET_LOOPBACK)
goto out;
- if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL)
+ skb = skb_share_check(skb, GFP_ATOMIC);
+ if (skb == NULL)
goto oom;
/* drop any routing info */
@@ -310,7 +311,7 @@ static int packet_rcv_spkt(struct sk_buf
* to prevent sockets using all the memory up.
*/
- if (sock_queue_rcv_skb(sk,skb) == 0)
+ if (sock_queue_rcv_skb(sk, skb) == 0)
return 0;
out:
@@ -329,25 +330,24 @@ static int packet_sendmsg_spkt(struct ki
struct msghdr *msg, size_t len)
{
struct sock *sk = sock->sk;
- struct sockaddr_pkt *saddr=(struct sockaddr_pkt *)msg->msg_name;
+ struct sockaddr_pkt *saddr = (struct sockaddr_pkt *)msg->msg_name;
struct sk_buff *skb;
struct net_device *dev;
- unsigned short proto=0;
+ unsigned short proto;
int err;
-
+
/*
* Get and verify the address.
*/
- if (saddr)
- {
- if (msg->msg_namelen < sizeof(struct sockaddr))
- return(-EINVAL);
- if (msg->msg_namelen==sizeof(struct sockaddr_pkt))
- proto=saddr->spkt_protocol;
- }
+ if (!saddr) /* SOCK_PACKET must be sent giving an address */
+ return -ENOTCONN;
+ if (msg->msg_namelen < sizeof(struct sockaddr))
+ return -EINVAL;
+ if (msg->msg_namelen == sizeof(struct sockaddr_pkt))
+ proto = saddr->spkt_protocol;
else
- return(-ENOTCONN); /* SOCK_PACKET must be sent giving an
address */
+ proto = 0;
/*
* Find the device first to size check it
@@ -355,30 +355,34 @@ static int packet_sendmsg_spkt(struct ki
saddr->spkt_device[13] = 0;
dev = dev_get_by_name(saddr->spkt_device);
- err = -ENODEV;
- if (dev == NULL)
+ if (dev == NULL) {
+ err = -ENODEV;
goto out_unlock;
-
+ }
+
/*
- * You may not queue a frame bigger than the mtu. This is the
lowest level
- * raw protocol and you must do your own fragmentation at this
level.
+ * You may not queue a frame bigger than the mtu.
+ * This is the lowest level raw protocol and you must do
+ * your own fragmentation at this level.
*/
- err = -EMSGSIZE;
- if(len>dev->mtu+dev->hard_header_len)
+ if (len > dev->mtu + dev->hard_header_len) {
+ err = -EMSGSIZE;
goto out_unlock;
+ }
- err = -ENOBUFS;
skb = sock_wmalloc(sk, len + LL_RESERVED_SPACE(dev), 0, GFP_KERNEL);
/*
- * If the write buffer is full, then tough. At this level the user
gets to
- * deal with the problem - do your own algorithmic backoffs.
That's far
- * more flexible.
+ * If the write buffer is full, then tough.
+ * At this level the user gets to deal with the problem.
+ * Do your own algorithmic backoffs. That's far more flexible.
*/
- if (skb == NULL)
+ if (skb == NULL) {
+ err = -ENOBUFS;
goto out_unlock;
+ }
/*
* Fill it in
@@ -400,16 +404,18 @@ static int packet_sendmsg_spkt(struct ki
}
/* Returns -EFAULT on error */
- err = memcpy_fromiovec(skb_put(skb,len), msg->msg_iov, len);
- skb->protocol = proto;
- skb->dev = dev;
- skb->priority = sk->sk_priority;
+ err = memcpy_fromiovec(skb_put(skb, len), msg->msg_iov, len);
if (err)
goto out_free;
- err = -ENETDOWN;
- if (!(dev->flags & IFF_UP))
+ if (!(dev->flags & IFF_UP)) {
+ err = -ENETDOWN;
goto out_free;
+ }
+
+ skb->protocol = proto;
+ skb->dev = dev;
+ skb->priority = sk->sk_priority;
/*
* Now send it
@@ -417,7 +423,7 @@ static int packet_sendmsg_spkt(struct ki
dev_queue_xmit(skb);
dev_put(dev);
- return(len);
+ return len;
out_free:
kfree_skb(skb);
@@ -729,31 +735,32 @@ static int packet_sendmsg(struct kiocb *
proto = po->num;
addr = NULL;
} else {
- err = -EINVAL;
- if (msg->msg_namelen < sizeof(struct sockaddr_ll))
- goto out;
- if (msg->msg_namelen < (saddr->sll_halen + offsetof(struct
sockaddr_ll, sll_addr)))
+ if (msg->msg_namelen < sizeof(struct sockaddr_ll) ||
+ msg->msg_namelen < (saddr->sll_halen + offsetof(struct
sockaddr_ll, sll_addr))) {
+ err = -EINVAL;
goto out;
+ }
ifindex = saddr->sll_ifindex;
proto = saddr->sll_protocol;
addr = saddr->sll_addr;
}
-
dev = dev_get_by_index(ifindex);
- err = -ENXIO;
- if (dev == NULL)
+ if (dev == NULL) {
+ err = -ENXIO;
goto out_unlock;
+ }
if (sock->type == SOCK_RAW)
reserve = dev->hard_header_len;
- err = -EMSGSIZE;
- if (len > dev->mtu+reserve)
+ if (len > dev->mtu + reserve) {
+ err = -EMSGSIZE;
goto out_unlock;
+ }
skb = sock_alloc_send_skb(sk, len + LL_RESERVED_SPACE(dev),
- msg->msg_flags & MSG_DONTWAIT, &err);
- if (skb==NULL)
+ msg->msg_flags & MSG_DONTWAIT, &err);
+ if (skb == NULL)
goto out_unlock;
skb_reserve(skb, LL_RESERVED_SPACE(dev));
@@ -761,39 +768,43 @@ static int packet_sendmsg(struct kiocb *
if (dev->hard_header) {
int res;
- err = -EINVAL;
res = dev->hard_header(skb, dev, ntohs(proto), addr, NULL, len);
if (sock->type != SOCK_DGRAM) {
skb->tail = skb->data;
skb->len = 0;
- } else if (res < 0)
+ } else if (res < 0) {
+ err = -EINVAL;
goto out_free;
+ }
}
/* 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);
if (err)
goto out_free;
+ if (!(dev->flags & IFF_UP)) {
+ err = -ENETDOWN;
+ goto out_free;
+ }
+
skb->protocol = proto;
skb->dev = dev;
skb->priority = sk->sk_priority;
- err = -ENETDOWN;
- if (!(dev->flags & IFF_UP))
- goto out_free;
-
/*
* Now send it
*/
err = dev_queue_xmit(skb);
- if (err > 0 && (err = net_xmit_errno(err)) != 0)
- goto out_unlock;
+ if (err > 0) {
+ err = net_xmit_errno(err);
+ if (err != 0)
+ goto out_unlock;
+ }
dev_put(dev);
-
- return(len);
+ return len;
out_free:
kfree_skb(skb);
@@ -926,24 +937,24 @@ out_unlock:
static int packet_bind_spkt(struct socket *sock, struct sockaddr *uaddr, int
addr_len)
{
- struct sock *sk=sock->sk;
+ struct sock *sk = sock->sk;
char name[15];
struct net_device *dev;
- int err = -ENODEV;
+ int err;
/*
* Check legality
*/
- if(addr_len!=sizeof(struct sockaddr))
+ if (addr_len != sizeof(struct sockaddr))
return -EINVAL;
- strlcpy(name,uaddr->sa_data,sizeof(name));
+ strlcpy(name, uaddr->sa_data, sizeof(name));
dev = dev_get_by_name(name);
- if (dev) {
- err = packet_do_bind(sk, dev, pkt_sk(sk)->num);
- dev_put(dev);
- }
+ if (!dev)
+ return -ENODEV;
+ err = packet_do_bind(sk, dev, pkt_sk(sk)->num);
+ dev_put(dev);
return err;
}
#endif
@@ -951,7 +962,7 @@ static int packet_bind_spkt(struct socke
static int packet_bind(struct socket *sock, struct sockaddr *uaddr, int
addr_len)
{
struct sockaddr_ll *sll = (struct sockaddr_ll*)uaddr;
- struct sock *sk=sock->sk;
+ struct sock *sk = sock->sk;
struct net_device *dev = NULL;
int err;
@@ -966,10 +977,11 @@ static int packet_bind(struct socket *so
return -EINVAL;
if (sll->sll_ifindex) {
- err = -ENODEV;
dev = dev_get_by_index(sll->sll_ifindex);
- if (dev == NULL)
+ if (dev == NULL) {
+ err = -ENODEV;
goto out;
+ }
}
err = packet_do_bind(sk, dev, sll->sll_protocol ? : pkt_sk(sk)->num);
if (dev)
@@ -1047,7 +1059,7 @@ static int packet_create(struct socket *
write_lock_bh(&packet_sklist_lock);
sk_add_node(sk, &packet_sklist);
write_unlock_bh(&packet_sklist_lock);
- return(0);
+ return 0;
out:
return err;
}
@@ -1084,7 +1096,7 @@ static int packet_recvmsg(struct kiocb *
* 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()
@@ -1092,7 +1104,7 @@ static int packet_recvmsg(struct kiocb *
* retries.
*/
- if(skb==NULL)
+ if (skb == NULL)
goto out;
/*
@@ -1112,9 +1124,8 @@ static int packet_recvmsg(struct kiocb *
*/
copied = skb->len;
- if (copied > len)
- {
- copied=len;
+ if (copied > len) {
+ copied = len;
msg->msg_flags|=MSG_TRUNC;
}
@@ -1228,19 +1239,22 @@ static int packet_mc_add(struct sock *sk
rtnl_lock();
- err = -ENODEV;
dev = __dev_get_by_index(mreq->mr_ifindex);
- if (!dev)
+ if (!dev) {
+ err = -ENODEV;
goto done;
+ }
- err = -EINVAL;
- if (mreq->mr_alen > dev->addr_len)
+ if (mreq->mr_alen > dev->addr_len) {
+ err = -EINVAL;
goto done;
+ }
- err = -ENOBUFS;
i = kmalloc(sizeof(*i), GFP_KERNEL);
- if (i == NULL)
+ if (i == NULL) {
+ err = -ENOBUFS;
goto done;
+ }
err = 0;
for (ml = po->mclist; ml; ml = ml->next) {
@@ -1342,7 +1356,7 @@ packet_setsockopt(struct socket *sock, i
return -EINVAL;
if (len > sizeof(mreq))
len = sizeof(mreq);
- if (copy_from_user(&mreq,optval,len))
+ if (copy_from_user(&mreq, optval, len))
return -EFAULT;
if (len < (mreq.mr_alen + offsetof(struct packet_mreq,
mr_address)))
return -EINVAL;
@@ -1358,9 +1372,9 @@ packet_setsockopt(struct socket *sock, i
{
struct tpacket_req req;
- if (optlen<sizeof(req))
+ if (optlen < sizeof(req))
return -EINVAL;
- if (copy_from_user(&req,optval,sizeof(req)))
+ if (copy_from_user(&req, optval, sizeof(req)))
return -EFAULT;
return packet_set_ring(sk, &req, 0);
}
@@ -1368,9 +1382,9 @@ packet_setsockopt(struct socket *sock, i
{
int val;
- if (optlen!=sizeof(val))
+ if (optlen != sizeof(val))
return -EINVAL;
- if (copy_from_user(&val,optval,sizeof(val)))
+ if (copy_from_user(&val, optval, sizeof(val)))
return -EFAULT;
pkt_sk(sk)->copy_thresh = val;
@@ -1392,8 +1406,8 @@ static int packet_getsockopt(struct sock
if (level != SOL_PACKET)
return -ENOPROTOOPT;
- if (get_user(len,optlen))
- return -EFAULT;
+ if (get_user(len, optlen))
+ return -EFAULT;
if (len < 0)
return -EINVAL;
@@ -1580,7 +1594,7 @@ static void packet_mm_close(struct vm_ar
static struct vm_operations_struct packet_mmap_ops = {
.open = packet_mm_open,
- .close =packet_mm_close,
+ .close = packet_mm_close,
};
static inline struct page *pg_vec_endpage(char *one_pg_vec, unsigned int order)
@@ -1594,7 +1608,7 @@ static void free_pg_vec(char **pg_vec, u
for (i = 0; i < len; i++) {
if (likely(pg_vec[i]))
- free_pages((unsigned long) pg_vec[i], order);
+ free_pages((unsigned long)pg_vec[i], order);
}
kfree(pg_vec);
}
@@ -1613,7 +1627,7 @@ static char **alloc_pg_vec(struct tpacke
pg_vec = kzalloc(block_nr * sizeof(char *), GFP_KERNEL);
if (unlikely(!pg_vec))
- goto out;
+ return NULL;
for (i = 0; i < block_nr; i++) {
pg_vec[i] = alloc_one_pg_vec_page(order);
@@ -1621,13 +1635,11 @@ static char **alloc_pg_vec(struct tpacke
goto out_free_pgvec;
}
-out:
return pg_vec;
out_free_pgvec:
free_pg_vec(pg_vec, order, block_nr);
- pg_vec = NULL;
- goto out;
+ return NULL;
}
static int packet_set_ring(struct sock *sk, struct tpacket_req *req, int
closing)
@@ -1635,7 +1647,7 @@ static int packet_set_ring(struct sock *
char **pg_vec = NULL;
struct packet_sock *po = pkt_sk(sk);
int was_running, num, order = 0;
- int err = 0;
+ int err;
if (req->tp_block_nr) {
int i, l;
@@ -1661,11 +1673,10 @@ static int packet_set_ring(struct sock *
req->tp_frame_nr))
return -EINVAL;
- err = -ENOMEM;
order = get_order(req->tp_block_size);
pg_vec = alloc_pg_vec(req, order);
if (unlikely(!pg_vec))
- goto out;
+ return -ENOMEM;
l = 0;
for (i = 0; i < req->tp_block_nr; i++) {
@@ -1737,7 +1748,6 @@ static int packet_set_ring(struct sock *
if (pg_vec)
free_pg_vec(pg_vec, order, req->tp_block_nr);
-out:
return err;
}
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
