Some white-space clean-up.
git-svn-id: svn://svn.berlios.de//socketcan/trunk@679
030b6a49-0b11-0410-94ab-
b0dab22257f2
struct sock *sk = (struct sock *)data;
struct raw_sock *ro = raw_sk(sk);
struct sockaddr_can *addr;
struct sock *sk = (struct sock *)data;
struct raw_sock *ro = raw_sk(sk);
struct sockaddr_can *addr;
if (!ro->recv_own_msgs) {
/* check the received tx sock reference */
if (!ro->recv_own_msgs) {
/* check the received tx sock reference */
addr->can_family = AF_CAN;
addr->can_ifindex = skb->dev->ifindex;
addr->can_family = AF_CAN;
addr->can_ifindex = skb->dev->ifindex;
- error = sock_queue_rcv_skb(sk, skb);
- if (error < 0)
+ if (sock_queue_rcv_skb(sk, skb) < 0)
kfree_skb(skb);
}
static int raw_enable_filters(struct net_device *dev, struct sock *sk,
kfree_skb(skb);
}
static int raw_enable_filters(struct net_device *dev, struct sock *sk,
- struct can_filter *filter,
- int count)
+ struct can_filter *filter, int count)
}
static void raw_disable_filters(struct net_device *dev, struct sock *sk,
}
static void raw_disable_filters(struct net_device *dev, struct sock *sk,
- struct can_filter *filter,
- int count)
+ struct can_filter *filter, int count)
/* filters set by default/setsockopt */
err = raw_enable_allfilters(dev, sk);
dev_put(dev);
/* filters set by default/setsockopt */
err = raw_enable_allfilters(dev, sk);
dev_put(dev);
if (err) {
if (count > 1)
kfree(filter);
if (err) {
if (count > 1)
kfree(filter);
{
struct sock *sk = sock->sk;
struct sk_buff *skb;
{
struct sock *sk = sock->sk;
struct sk_buff *skb;
int noblock;
noblock = flags & MSG_DONTWAIT;
flags &= ~MSG_DONTWAIT;
int noblock;
noblock = flags & MSG_DONTWAIT;
flags &= ~MSG_DONTWAIT;
- skb = skb_recv_datagram(sk, flags, noblock, &error);
+ skb = skb_recv_datagram(sk, flags, noblock, &err);
if (size < skb->len)
msg->msg_flags |= MSG_TRUNC;
else
size = skb->len;
if (size < skb->len)
msg->msg_flags |= MSG_TRUNC;
else
size = skb->len;
- error = memcpy_toiovec(msg->msg_iov, skb->data, size);
- if (error < 0) {
+ err = memcpy_toiovec(msg->msg_iov, skb->data, size);
+ if (err < 0) {
skb_free_datagram(sk, skb);
skb_free_datagram(sk, skb);
}
sock_recv_timestamp(msg, sk, skb);
}
sock_recv_timestamp(msg, sk, skb);