|
@@ -98,7 +98,7 @@ int ip6_datagram_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)
|
|
|
sin.sin_port = usin->sin6_port;
|
|
|
|
|
|
err = ip4_datagram_connect(sk,
|
|
|
- (struct sockaddr*) &sin,
|
|
|
+ (struct sockaddr *) &sin,
|
|
|
sizeof(sin));
|
|
|
|
|
|
ipv4_connected:
|
|
@@ -518,7 +518,7 @@ int datagram_recv_ctl(struct sock *sk, struct msghdr *msg, struct sk_buff *skb)
|
|
|
unsigned len;
|
|
|
u8 *ptr = nh + off;
|
|
|
|
|
|
- switch(nexthdr) {
|
|
|
+ switch (nexthdr) {
|
|
|
case IPPROTO_DSTOPTS:
|
|
|
nexthdr = ptr[0];
|
|
|
len = (ptr[1] + 1) << 3;
|
|
@@ -827,9 +827,8 @@ int datagram_send_ctl(struct net *net, struct sock *sk,
|
|
|
int tc;
|
|
|
|
|
|
err = -EINVAL;
|
|
|
- if (cmsg->cmsg_len != CMSG_LEN(sizeof(int))) {
|
|
|
+ if (cmsg->cmsg_len != CMSG_LEN(sizeof(int)))
|
|
|
goto exit_f;
|
|
|
- }
|
|
|
|
|
|
tc = *(int *)CMSG_DATA(cmsg);
|
|
|
if (tc < -1 || tc > 0xff)
|
|
@@ -846,9 +845,8 @@ int datagram_send_ctl(struct net *net, struct sock *sk,
|
|
|
int df;
|
|
|
|
|
|
err = -EINVAL;
|
|
|
- if (cmsg->cmsg_len != CMSG_LEN(sizeof(int))) {
|
|
|
+ if (cmsg->cmsg_len != CMSG_LEN(sizeof(int)))
|
|
|
goto exit_f;
|
|
|
- }
|
|
|
|
|
|
df = *(int *)CMSG_DATA(cmsg);
|
|
|
if (df < 0 || df > 1)
|