forked from Minki/linux
[NET]: cleanup extra semicolons
Spring cleaning time... There seems to be a lot of places in the network code that have extra bogus semicolons after conditionals. Most commonly is a bogus semicolon after: switch() { } Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
c462238d6a
commit
3ff50b7997
@ -554,7 +554,8 @@ static int rif_seq_show(struct seq_file *seq, void *v)
|
|||||||
if(j==1) {
|
if(j==1) {
|
||||||
segment=ntohs(entry->rseg[j-1])>>4;
|
segment=ntohs(entry->rseg[j-1])>>4;
|
||||||
seq_printf(seq," %03X",segment);
|
seq_printf(seq," %03X",segment);
|
||||||
};
|
}
|
||||||
|
|
||||||
segment=ntohs(entry->rseg[j])>>4;
|
segment=ntohs(entry->rseg[j])>>4;
|
||||||
brdgnmb=ntohs(entry->rseg[j-1])&0x00f;
|
brdgnmb=ntohs(entry->rseg[j-1])&0x00f;
|
||||||
seq_printf(seq,"-%01X-%03X",brdgnmb,segment);
|
seq_printf(seq,"-%01X-%03X",brdgnmb,segment);
|
||||||
|
@ -470,7 +470,7 @@ static struct net_device *register_vlan_device(const char *eth_IF_name,
|
|||||||
*/
|
*/
|
||||||
default:
|
default:
|
||||||
snprintf(name, IFNAMSIZ, "vlan%.4i", VLAN_ID);
|
snprintf(name, IFNAMSIZ, "vlan%.4i", VLAN_ID);
|
||||||
};
|
}
|
||||||
|
|
||||||
new_dev = alloc_netdev(sizeof(struct vlan_dev_info), name,
|
new_dev = alloc_netdev(sizeof(struct vlan_dev_info), name,
|
||||||
vlan_setup);
|
vlan_setup);
|
||||||
@ -685,7 +685,7 @@ static int vlan_device_event(struct notifier_block *unused, unsigned long event,
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
};
|
}
|
||||||
|
|
||||||
out:
|
out:
|
||||||
return NOTIFY_DONE;
|
return NOTIFY_DONE;
|
||||||
@ -819,7 +819,7 @@ static int vlan_ioctl_handler(void __user *arg)
|
|||||||
printk(VLAN_DBG "%s: Unknown VLAN CMD: %x \n",
|
printk(VLAN_DBG "%s: Unknown VLAN CMD: %x \n",
|
||||||
__FUNCTION__, args.cmd);
|
__FUNCTION__, args.cmd);
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
};
|
}
|
||||||
out:
|
out:
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
@ -66,7 +66,7 @@ int vlan_dev_rebuild_header(struct sk_buff *skb)
|
|||||||
|
|
||||||
memcpy(veth->h_source, dev->dev_addr, ETH_ALEN);
|
memcpy(veth->h_source, dev->dev_addr, ETH_ALEN);
|
||||||
break;
|
break;
|
||||||
};
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@ -219,7 +219,7 @@ int vlan_skb_recv(struct sk_buff *skb, struct net_device *dev,
|
|||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
};
|
}
|
||||||
|
|
||||||
/* Was a VLAN packet, grab the encapsulated protocol, which the layer
|
/* Was a VLAN packet, grab the encapsulated protocol, which the layer
|
||||||
* three protocols care about.
|
* three protocols care about.
|
||||||
|
@ -121,7 +121,7 @@ int ax25_rebuild_header(struct sk_buff *skb)
|
|||||||
digipeat = route->digipeat;
|
digipeat = route->digipeat;
|
||||||
dev = route->dev;
|
dev = route->dev;
|
||||||
ip_mode = route->ip_mode;
|
ip_mode = route->ip_mode;
|
||||||
};
|
}
|
||||||
|
|
||||||
if (dev == NULL)
|
if (dev == NULL)
|
||||||
dev = skb->dev;
|
dev = skb->dev;
|
||||||
|
@ -149,7 +149,7 @@ static int __hci_request(struct hci_dev *hdev, void (*req)(struct hci_dev *hdev,
|
|||||||
default:
|
default:
|
||||||
err = -ETIMEDOUT;
|
err = -ETIMEDOUT;
|
||||||
break;
|
break;
|
||||||
};
|
}
|
||||||
|
|
||||||
hdev->req_status = hdev->req_result = 0;
|
hdev->req_status = hdev->req_result = 0;
|
||||||
|
|
||||||
@ -1388,7 +1388,7 @@ static void hci_rx_task(unsigned long arg)
|
|||||||
case HCI_SCODATA_PKT:
|
case HCI_SCODATA_PKT:
|
||||||
kfree_skb(skb);
|
kfree_skb(skb);
|
||||||
continue;
|
continue;
|
||||||
};
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Process frame */
|
/* Process frame */
|
||||||
|
@ -393,7 +393,7 @@ static void sco_sock_close(struct sock *sk)
|
|||||||
default:
|
default:
|
||||||
sock_set_flag(sk, SOCK_ZAPPED);
|
sock_set_flag(sk, SOCK_ZAPPED);
|
||||||
break;
|
break;
|
||||||
};
|
}
|
||||||
|
|
||||||
release_sock(sk);
|
release_sock(sk);
|
||||||
|
|
||||||
|
@ -79,7 +79,7 @@ static void rfc2863_policy(struct net_device *dev)
|
|||||||
case IF_LINK_MODE_DEFAULT:
|
case IF_LINK_MODE_DEFAULT:
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
};
|
}
|
||||||
|
|
||||||
dev->operstate = operstate;
|
dev->operstate = operstate;
|
||||||
|
|
||||||
|
@ -786,7 +786,7 @@ static int count_trail_chars(const char __user * user_buffer,
|
|||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
goto done;
|
goto done;
|
||||||
};
|
}
|
||||||
}
|
}
|
||||||
done:
|
done:
|
||||||
return i;
|
return i;
|
||||||
@ -829,7 +829,7 @@ static int strn_len(const char __user * user_buffer, unsigned int maxlen)
|
|||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
};
|
}
|
||||||
}
|
}
|
||||||
done_str:
|
done_str:
|
||||||
return i;
|
return i;
|
||||||
@ -1906,7 +1906,7 @@ static int pktgen_device_event(struct notifier_block *unused,
|
|||||||
case NETDEV_UNREGISTER:
|
case NETDEV_UNREGISTER:
|
||||||
pktgen_mark_device(dev->name);
|
pktgen_mark_device(dev->name);
|
||||||
break;
|
break;
|
||||||
};
|
}
|
||||||
|
|
||||||
return NOTIFY_DONE;
|
return NOTIFY_DONE;
|
||||||
}
|
}
|
||||||
|
@ -399,7 +399,7 @@ static void set_operstate(struct net_device *dev, unsigned char transition)
|
|||||||
operstate == IF_OPER_UNKNOWN)
|
operstate == IF_OPER_UNKNOWN)
|
||||||
operstate = IF_OPER_DORMANT;
|
operstate = IF_OPER_DORMANT;
|
||||||
break;
|
break;
|
||||||
};
|
}
|
||||||
|
|
||||||
if (dev->operstate != operstate) {
|
if (dev->operstate != operstate) {
|
||||||
write_lock_bh(&dev_base_lock);
|
write_lock_bh(&dev_base_lock);
|
||||||
|
@ -304,7 +304,7 @@ void kfree_skbmem(struct sk_buff *skb)
|
|||||||
if (atomic_dec_and_test(fclone_ref))
|
if (atomic_dec_and_test(fclone_ref))
|
||||||
kmem_cache_free(skbuff_fclone_cache, other);
|
kmem_cache_free(skbuff_fclone_cache, other);
|
||||||
break;
|
break;
|
||||||
};
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -927,7 +927,7 @@ int fib_semantic_match(struct list_head *head, const struct flowi *flp,
|
|||||||
default:
|
default:
|
||||||
printk(KERN_DEBUG "impossible 102\n");
|
printk(KERN_DEBUG "impossible 102\n");
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
};
|
}
|
||||||
}
|
}
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
@ -939,7 +939,7 @@ static int __init ic_bootp_recv(struct sk_buff *skb, struct net_device *dev, str
|
|||||||
if (opt[1] >= 4)
|
if (opt[1] >= 4)
|
||||||
memcpy(&server_id, opt + 2, 4);
|
memcpy(&server_id, opt + 2, 4);
|
||||||
break;
|
break;
|
||||||
};
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef IPCONFIG_DEBUG
|
#ifdef IPCONFIG_DEBUG
|
||||||
@ -984,7 +984,7 @@ static int __init ic_bootp_recv(struct sk_buff *skb, struct net_device *dev, str
|
|||||||
ic_myaddr = NONE;
|
ic_myaddr = NONE;
|
||||||
ic_servaddr = NONE;
|
ic_servaddr = NONE;
|
||||||
goto drop_unlock;
|
goto drop_unlock;
|
||||||
};
|
}
|
||||||
|
|
||||||
ic_dhcp_msgtype = mt;
|
ic_dhcp_msgtype = mt;
|
||||||
|
|
||||||
|
@ -100,7 +100,7 @@ static int drr_dev_event(struct notifier_block *this,
|
|||||||
|
|
||||||
spin_unlock_bh(&state_lock);
|
spin_unlock_bh(&state_lock);
|
||||||
break;
|
break;
|
||||||
};
|
}
|
||||||
|
|
||||||
return NOTIFY_DONE;
|
return NOTIFY_DONE;
|
||||||
}
|
}
|
||||||
|
@ -444,7 +444,7 @@ int tcp_ioctl(struct sock *sk, int cmd, unsigned long arg)
|
|||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
return -ENOIOCTLCMD;
|
return -ENOIOCTLCMD;
|
||||||
};
|
}
|
||||||
|
|
||||||
return put_user(answ, (int __user *)arg);
|
return put_user(answ, (int __user *)arg);
|
||||||
}
|
}
|
||||||
@ -1954,7 +1954,8 @@ static int do_tcp_setsockopt(struct sock *sk, int level,
|
|||||||
default:
|
default:
|
||||||
err = -ENOPROTOOPT;
|
err = -ENOPROTOOPT;
|
||||||
break;
|
break;
|
||||||
};
|
}
|
||||||
|
|
||||||
release_sock(sk);
|
release_sock(sk);
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
@ -2124,7 +2125,7 @@ static int do_tcp_getsockopt(struct sock *sk, int level,
|
|||||||
return 0;
|
return 0;
|
||||||
default:
|
default:
|
||||||
return -ENOPROTOOPT;
|
return -ENOPROTOOPT;
|
||||||
};
|
}
|
||||||
|
|
||||||
if (put_user(len, optlen))
|
if (put_user(len, optlen))
|
||||||
return -EFAULT;
|
return -EFAULT;
|
||||||
|
@ -2708,7 +2708,7 @@ static int tcp_process_frto(struct sock *sk, u32 prior_snd_una, int flag)
|
|||||||
default:
|
default:
|
||||||
tcp_ratehalving_spur_to_response(sk);
|
tcp_ratehalving_spur_to_response(sk);
|
||||||
break;
|
break;
|
||||||
};
|
}
|
||||||
tp->frto_counter = 0;
|
tp->frto_counter = 0;
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
@ -2915,10 +2915,11 @@ void tcp_parse_options(struct sk_buff *skb, struct tcp_options_received *opt_rx,
|
|||||||
*/
|
*/
|
||||||
break;
|
break;
|
||||||
#endif
|
#endif
|
||||||
};
|
}
|
||||||
|
|
||||||
ptr+=opsize-2;
|
ptr+=opsize-2;
|
||||||
length-=opsize;
|
length-=opsize;
|
||||||
};
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -3124,7 +3125,7 @@ static void tcp_fin(struct sk_buff *skb, struct sock *sk, struct tcphdr *th)
|
|||||||
printk(KERN_ERR "%s: Impossible, sk->sk_state=%d\n",
|
printk(KERN_ERR "%s: Impossible, sk->sk_state=%d\n",
|
||||||
__FUNCTION__, sk->sk_state);
|
__FUNCTION__, sk->sk_state);
|
||||||
break;
|
break;
|
||||||
};
|
}
|
||||||
|
|
||||||
/* It _is_ possible, that we have something out-of-order _after_ FIN.
|
/* It _is_ possible, that we have something out-of-order _after_ FIN.
|
||||||
* Probably, we should reset in this case. For now drop them.
|
* Probably, we should reset in this case. For now drop them.
|
||||||
|
@ -263,7 +263,7 @@ _decode_session4(struct sk_buff *skb, struct flowi *fl)
|
|||||||
default:
|
default:
|
||||||
fl->fl_ipsec_spi = 0;
|
fl->fl_ipsec_spi = 0;
|
||||||
break;
|
break;
|
||||||
};
|
}
|
||||||
}
|
}
|
||||||
fl->proto = iph->protocol;
|
fl->proto = iph->protocol;
|
||||||
fl->fl4_dst = iph->daddr;
|
fl->fl4_dst = iph->daddr;
|
||||||
|
@ -2288,7 +2288,7 @@ static int addrconf_notify(struct notifier_block *this, unsigned long event,
|
|||||||
default:
|
default:
|
||||||
addrconf_dev_config(dev);
|
addrconf_dev_config(dev);
|
||||||
break;
|
break;
|
||||||
};
|
}
|
||||||
if (idev) {
|
if (idev) {
|
||||||
if (run_pending)
|
if (run_pending)
|
||||||
addrconf_dad_run(idev);
|
addrconf_dad_run(idev);
|
||||||
@ -2341,7 +2341,7 @@ static int addrconf_notify(struct notifier_block *this, unsigned long event,
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
break;
|
break;
|
||||||
};
|
}
|
||||||
|
|
||||||
return NOTIFY_OK;
|
return NOTIFY_OK;
|
||||||
}
|
}
|
||||||
|
@ -723,7 +723,7 @@ int datagram_send_ctl(struct msghdr *msg, struct flowi *fl,
|
|||||||
cmsg->cmsg_type);
|
cmsg->cmsg_type);
|
||||||
err = -EINVAL;
|
err = -EINVAL;
|
||||||
break;
|
break;
|
||||||
};
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
exit_f:
|
exit_f:
|
||||||
|
@ -130,7 +130,7 @@ static int ip6_tlvopt_unknown(struct sk_buff **skbp, int optoff)
|
|||||||
case 2: /* send ICMP PARM PROB regardless and drop packet */
|
case 2: /* send ICMP PARM PROB regardless and drop packet */
|
||||||
icmpv6_param_prob(skb, ICMPV6_UNK_OPTION, optoff);
|
icmpv6_param_prob(skb, ICMPV6_UNK_OPTION, optoff);
|
||||||
return 0;
|
return 0;
|
||||||
};
|
}
|
||||||
|
|
||||||
kfree_skb(skb);
|
kfree_skb(skb);
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -732,7 +732,8 @@ static int icmpv6_rcv(struct sk_buff **pskb)
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
icmpv6_notify(skb, type, hdr->icmp6_code, hdr->icmp6_mtu);
|
icmpv6_notify(skb, type, hdr->icmp6_code, hdr->icmp6_mtu);
|
||||||
};
|
}
|
||||||
|
|
||||||
kfree_skb(skb);
|
kfree_skb(skb);
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
@ -865,7 +866,7 @@ int icmpv6_err_convert(int type, int code, int *err)
|
|||||||
case ICMPV6_TIME_EXCEED:
|
case ICMPV6_TIME_EXCEED:
|
||||||
*err = EHOSTUNREACH;
|
*err = EHOSTUNREACH;
|
||||||
break;
|
break;
|
||||||
};
|
}
|
||||||
|
|
||||||
return fatal;
|
return fatal;
|
||||||
}
|
}
|
||||||
|
@ -1630,7 +1630,7 @@ int ndisc_rcv(struct sk_buff *skb)
|
|||||||
case NDISC_REDIRECT:
|
case NDISC_REDIRECT:
|
||||||
ndisc_redirect_rcv(skb);
|
ndisc_redirect_rcv(skb);
|
||||||
break;
|
break;
|
||||||
};
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -882,7 +882,7 @@ static int rawv6_seticmpfilter(struct sock *sk, int level, int optname,
|
|||||||
return 0;
|
return 0;
|
||||||
default:
|
default:
|
||||||
return -ENOPROTOOPT;
|
return -ENOPROTOOPT;
|
||||||
};
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@ -907,7 +907,7 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
|
|||||||
return 0;
|
return 0;
|
||||||
default:
|
default:
|
||||||
return -ENOPROTOOPT;
|
return -ENOPROTOOPT;
|
||||||
};
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@ -961,7 +961,8 @@ static int rawv6_setsockopt(struct sock *sk, int level, int optname,
|
|||||||
default:
|
default:
|
||||||
return ipv6_setsockopt(sk, level, optname, optval,
|
return ipv6_setsockopt(sk, level, optname, optval,
|
||||||
optlen);
|
optlen);
|
||||||
};
|
}
|
||||||
|
|
||||||
return do_rawv6_setsockopt(sk, level, optname, optval, optlen);
|
return do_rawv6_setsockopt(sk, level, optname, optval, optlen);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -982,7 +983,7 @@ static int compat_rawv6_setsockopt(struct sock *sk, int level, int optname,
|
|||||||
default:
|
default:
|
||||||
return compat_ipv6_setsockopt(sk, level, optname,
|
return compat_ipv6_setsockopt(sk, level, optname,
|
||||||
optval, optlen);
|
optval, optlen);
|
||||||
};
|
}
|
||||||
return do_rawv6_setsockopt(sk, level, optname, optval, optlen);
|
return do_rawv6_setsockopt(sk, level, optname, optval, optlen);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
@ -1035,7 +1036,8 @@ static int rawv6_getsockopt(struct sock *sk, int level, int optname,
|
|||||||
default:
|
default:
|
||||||
return ipv6_getsockopt(sk, level, optname, optval,
|
return ipv6_getsockopt(sk, level, optname, optval,
|
||||||
optlen);
|
optlen);
|
||||||
};
|
}
|
||||||
|
|
||||||
return do_rawv6_getsockopt(sk, level, optname, optval, optlen);
|
return do_rawv6_getsockopt(sk, level, optname, optval, optlen);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1056,7 +1058,7 @@ static int compat_rawv6_getsockopt(struct sock *sk, int level, int optname,
|
|||||||
default:
|
default:
|
||||||
return compat_ipv6_getsockopt(sk, level, optname,
|
return compat_ipv6_getsockopt(sk, level, optname,
|
||||||
optval, optlen);
|
optval, optlen);
|
||||||
};
|
}
|
||||||
return do_rawv6_getsockopt(sk, level, optname, optval, optlen);
|
return do_rawv6_getsockopt(sk, level, optname, optval, optlen);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
@ -1760,7 +1760,7 @@ int ipv6_route_ioctl(unsigned int cmd, void __user *arg)
|
|||||||
rtnl_unlock();
|
rtnl_unlock();
|
||||||
|
|
||||||
return err;
|
return err;
|
||||||
};
|
}
|
||||||
|
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
|
@ -240,7 +240,8 @@ __xfrm6_bundle_create(struct xfrm_policy *policy, struct xfrm_state **xfrm, int
|
|||||||
if (!afinfo) {
|
if (!afinfo) {
|
||||||
dst = *dst_p;
|
dst = *dst_p;
|
||||||
goto error;
|
goto error;
|
||||||
};
|
}
|
||||||
|
|
||||||
dst_prev->output = afinfo->output;
|
dst_prev->output = afinfo->output;
|
||||||
xfrm_state_put_afinfo(afinfo);
|
xfrm_state_put_afinfo(afinfo);
|
||||||
/* Sheit... I remember I did this right. Apparently,
|
/* Sheit... I remember I did this right. Apparently,
|
||||||
@ -337,7 +338,7 @@ _decode_session6(struct sk_buff *skb, struct flowi *fl)
|
|||||||
fl->fl_ipsec_spi = 0;
|
fl->fl_ipsec_spi = 0;
|
||||||
fl->proto = nexthdr;
|
fl->proto = nexthdr;
|
||||||
return;
|
return;
|
||||||
};
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -220,7 +220,7 @@ static void irda_connect_confirm(void *instance, void *sap,
|
|||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
self->max_data_size = irttp_get_max_seg_size(self->tsap);
|
self->max_data_size = irttp_get_max_seg_size(self->tsap);
|
||||||
};
|
}
|
||||||
|
|
||||||
IRDA_DEBUG(2, "%s(), max_data_size=%d\n", __FUNCTION__,
|
IRDA_DEBUG(2, "%s(), max_data_size=%d\n", __FUNCTION__,
|
||||||
self->max_data_size);
|
self->max_data_size);
|
||||||
@ -283,7 +283,7 @@ static void irda_connect_indication(void *instance, void *sap,
|
|||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
self->max_data_size = irttp_get_max_seg_size(self->tsap);
|
self->max_data_size = irttp_get_max_seg_size(self->tsap);
|
||||||
};
|
}
|
||||||
|
|
||||||
IRDA_DEBUG(2, "%s(), max_data_size=%d\n", __FUNCTION__,
|
IRDA_DEBUG(2, "%s(), max_data_size=%d\n", __FUNCTION__,
|
||||||
self->max_data_size);
|
self->max_data_size);
|
||||||
|
@ -181,7 +181,7 @@ static void iucv_sock_close(struct sock *sk)
|
|||||||
default:
|
default:
|
||||||
sock_set_flag(sk, SOCK_ZAPPED);
|
sock_set_flag(sk, SOCK_ZAPPED);
|
||||||
break;
|
break;
|
||||||
};
|
}
|
||||||
|
|
||||||
release_sock(sk);
|
release_sock(sk);
|
||||||
iucv_sock_kill(sk);
|
iucv_sock_kill(sk);
|
||||||
|
@ -379,7 +379,7 @@ static int verify_address_len(void *p)
|
|||||||
*/
|
*/
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
break;
|
break;
|
||||||
};
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -436,7 +436,7 @@ static void u32_destroy(struct tcf_proto *tp)
|
|||||||
BUG_TRAP(ht->refcnt == 0);
|
BUG_TRAP(ht->refcnt == 0);
|
||||||
|
|
||||||
kfree(ht);
|
kfree(ht);
|
||||||
};
|
}
|
||||||
|
|
||||||
kfree(tp_c);
|
kfree(tp_c);
|
||||||
}
|
}
|
||||||
|
@ -226,7 +226,7 @@ static int dsmark_enqueue(struct sk_buff *skb,struct Qdisc *sch)
|
|||||||
default:
|
default:
|
||||||
skb->tc_index = 0;
|
skb->tc_index = 0;
|
||||||
break;
|
break;
|
||||||
};
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (TC_H_MAJ(skb->priority) == sch->handle)
|
if (TC_H_MAJ(skb->priority) == sch->handle)
|
||||||
@ -257,7 +257,7 @@ static int dsmark_enqueue(struct sk_buff *skb,struct Qdisc *sch)
|
|||||||
if (p->default_index != NO_DEFAULT_INDEX)
|
if (p->default_index != NO_DEFAULT_INDEX)
|
||||||
skb->tc_index = p->default_index;
|
skb->tc_index = p->default_index;
|
||||||
break;
|
break;
|
||||||
};
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
err = p->q->enqueue(skb,p->q);
|
err = p->q->enqueue(skb,p->q);
|
||||||
@ -310,7 +310,7 @@ static struct sk_buff *dsmark_dequeue(struct Qdisc *sch)
|
|||||||
"unsupported protocol %d\n",
|
"unsupported protocol %d\n",
|
||||||
ntohs(skb->protocol));
|
ntohs(skb->protocol));
|
||||||
break;
|
break;
|
||||||
};
|
}
|
||||||
|
|
||||||
return skb;
|
return skb;
|
||||||
}
|
}
|
||||||
|
@ -170,7 +170,7 @@ static int ingress_enqueue(struct sk_buff *skb,struct Qdisc *sch)
|
|||||||
skb->tc_index = TC_H_MIN(res.classid);
|
skb->tc_index = TC_H_MIN(res.classid);
|
||||||
result = TC_ACT_OK;
|
result = TC_ACT_OK;
|
||||||
break;
|
break;
|
||||||
};
|
}
|
||||||
/* backward compat */
|
/* backward compat */
|
||||||
#else
|
#else
|
||||||
#ifdef CONFIG_NET_CLS_POLICE
|
#ifdef CONFIG_NET_CLS_POLICE
|
||||||
@ -187,7 +187,7 @@ static int ingress_enqueue(struct sk_buff *skb,struct Qdisc *sch)
|
|||||||
sch->bstats.bytes += skb->len;
|
sch->bstats.bytes += skb->len;
|
||||||
result = NF_ACCEPT;
|
result = NF_ACCEPT;
|
||||||
break;
|
break;
|
||||||
};
|
}
|
||||||
|
|
||||||
#else
|
#else
|
||||||
D2PRINTK("Overriding result to ACCEPT\n");
|
D2PRINTK("Overriding result to ACCEPT\n");
|
||||||
|
@ -62,7 +62,7 @@ prio_classify(struct sk_buff *skb, struct Qdisc *sch, int *qerr)
|
|||||||
*qerr = NET_XMIT_SUCCESS;
|
*qerr = NET_XMIT_SUCCESS;
|
||||||
case TC_ACT_SHOT:
|
case TC_ACT_SHOT:
|
||||||
return NULL;
|
return NULL;
|
||||||
};
|
}
|
||||||
|
|
||||||
if (!q->filter_list ) {
|
if (!q->filter_list ) {
|
||||||
#else
|
#else
|
||||||
|
@ -733,7 +733,7 @@ void sctp_assoc_control_transport(struct sctp_association *asoc,
|
|||||||
|
|
||||||
default:
|
default:
|
||||||
return;
|
return;
|
||||||
};
|
}
|
||||||
|
|
||||||
/* Generate and send a SCTP_PEER_ADDR_CHANGE notification to the
|
/* Generate and send a SCTP_PEER_ADDR_CHANGE notification to the
|
||||||
* user.
|
* user.
|
||||||
|
@ -93,8 +93,9 @@ const char *sctp_cname(const sctp_subtype_t cid)
|
|||||||
return "FWD_TSN";
|
return "FWD_TSN";
|
||||||
|
|
||||||
default:
|
default:
|
||||||
return "unknown chunk";
|
break;
|
||||||
};
|
}
|
||||||
|
|
||||||
return "unknown chunk";
|
return "unknown chunk";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -604,7 +604,7 @@ static sctp_scope_t sctp_v6_scope(union sctp_addr *addr)
|
|||||||
default:
|
default:
|
||||||
retval = SCTP_SCOPE_GLOBAL;
|
retval = SCTP_SCOPE_GLOBAL;
|
||||||
break;
|
break;
|
||||||
};
|
}
|
||||||
|
|
||||||
return retval;
|
return retval;
|
||||||
}
|
}
|
||||||
|
@ -176,7 +176,7 @@ sctp_xmit_t sctp_packet_transmit_chunk(struct sctp_packet *packet,
|
|||||||
case SCTP_XMIT_OK:
|
case SCTP_XMIT_OK:
|
||||||
case SCTP_XMIT_NAGLE_DELAY:
|
case SCTP_XMIT_NAGLE_DELAY:
|
||||||
break;
|
break;
|
||||||
};
|
}
|
||||||
|
|
||||||
return retval;
|
return retval;
|
||||||
}
|
}
|
||||||
|
@ -338,7 +338,7 @@ int sctp_outq_tail(struct sctp_outq *q, struct sctp_chunk *chunk)
|
|||||||
SCTP_INC_STATS(SCTP_MIB_OUTORDERCHUNKS);
|
SCTP_INC_STATS(SCTP_MIB_OUTORDERCHUNKS);
|
||||||
q->empty = 0;
|
q->empty = 0;
|
||||||
break;
|
break;
|
||||||
};
|
}
|
||||||
} else {
|
} else {
|
||||||
list_add_tail(&chunk->list, &q->control_chunk_list);
|
list_add_tail(&chunk->list, &q->control_chunk_list);
|
||||||
SCTP_INC_STATS(SCTP_MIB_OUTCTRLCHUNKS);
|
SCTP_INC_STATS(SCTP_MIB_OUTCTRLCHUNKS);
|
||||||
@ -630,7 +630,7 @@ static int sctp_outq_flush_rtx(struct sctp_outq *q, struct sctp_packet *pkt,
|
|||||||
/* Retrieve a new chunk to bundle. */
|
/* Retrieve a new chunk to bundle. */
|
||||||
lchunk = sctp_list_dequeue(lqueue);
|
lchunk = sctp_list_dequeue(lqueue);
|
||||||
break;
|
break;
|
||||||
};
|
}
|
||||||
|
|
||||||
/* If we are here due to a retransmit timeout or a fast
|
/* If we are here due to a retransmit timeout or a fast
|
||||||
* retransmit and if there are any chunks left in the retransmit
|
* retransmit and if there are any chunks left in the retransmit
|
||||||
@ -779,7 +779,7 @@ int sctp_outq_flush(struct sctp_outq *q, int rtx_timeout)
|
|||||||
default:
|
default:
|
||||||
/* We built a chunk with an illegal type! */
|
/* We built a chunk with an illegal type! */
|
||||||
BUG();
|
BUG();
|
||||||
};
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Is it OK to send data chunks? */
|
/* Is it OK to send data chunks? */
|
||||||
@ -1397,7 +1397,7 @@ static void sctp_check_transmitted(struct sctp_outq *q,
|
|||||||
SCTP_DEBUG_PRINTK("ACKed: %08x", tsn);
|
SCTP_DEBUG_PRINTK("ACKed: %08x", tsn);
|
||||||
dbg_prt_state = 0;
|
dbg_prt_state = 0;
|
||||||
dbg_ack_tsn = tsn;
|
dbg_ack_tsn = tsn;
|
||||||
};
|
}
|
||||||
|
|
||||||
dbg_last_ack_tsn = tsn;
|
dbg_last_ack_tsn = tsn;
|
||||||
#endif /* SCTP_DEBUG */
|
#endif /* SCTP_DEBUG */
|
||||||
@ -1452,7 +1452,7 @@ static void sctp_check_transmitted(struct sctp_outq *q,
|
|||||||
SCTP_DEBUG_PRINTK("KEPT: %08x",tsn);
|
SCTP_DEBUG_PRINTK("KEPT: %08x",tsn);
|
||||||
dbg_prt_state = 1;
|
dbg_prt_state = 1;
|
||||||
dbg_kept_tsn = tsn;
|
dbg_kept_tsn = tsn;
|
||||||
};
|
}
|
||||||
|
|
||||||
dbg_last_kept_tsn = tsn;
|
dbg_last_kept_tsn = tsn;
|
||||||
#endif /* SCTP_DEBUG */
|
#endif /* SCTP_DEBUG */
|
||||||
@ -1476,7 +1476,7 @@ static void sctp_check_transmitted(struct sctp_outq *q,
|
|||||||
} else {
|
} else {
|
||||||
SCTP_DEBUG_PRINTK("\n");
|
SCTP_DEBUG_PRINTK("\n");
|
||||||
}
|
}
|
||||||
};
|
}
|
||||||
#endif /* SCTP_DEBUG */
|
#endif /* SCTP_DEBUG */
|
||||||
if (transport) {
|
if (transport) {
|
||||||
if (bytes_acked) {
|
if (bytes_acked) {
|
||||||
|
@ -2077,7 +2077,7 @@ static int sctp_process_param(struct sctp_association *asoc,
|
|||||||
|
|
||||||
default: /* Just ignore anything else. */
|
default: /* Just ignore anything else. */
|
||||||
break;
|
break;
|
||||||
};
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
@ -2118,7 +2118,7 @@ static int sctp_process_param(struct sctp_association *asoc,
|
|||||||
SCTP_DEBUG_PRINTK("Ignoring param: %d for association %p.\n",
|
SCTP_DEBUG_PRINTK("Ignoring param: %d for association %p.\n",
|
||||||
ntohs(param.p->type), asoc);
|
ntohs(param.p->type), asoc);
|
||||||
break;
|
break;
|
||||||
};
|
}
|
||||||
|
|
||||||
return retval;
|
return retval;
|
||||||
}
|
}
|
||||||
|
@ -1009,7 +1009,7 @@ static int sctp_side_effects(sctp_event_t event_type, sctp_subtype_t subtype,
|
|||||||
status, state, event_type, subtype.chunk);
|
status, state, event_type, subtype.chunk);
|
||||||
BUG();
|
BUG();
|
||||||
break;
|
break;
|
||||||
};
|
}
|
||||||
|
|
||||||
bail:
|
bail:
|
||||||
return error;
|
return error;
|
||||||
@ -1489,7 +1489,8 @@ static int sctp_cmd_interpreter(sctp_event_t event_type,
|
|||||||
printk(KERN_WARNING "Impossible command: %u, %p\n",
|
printk(KERN_WARNING "Impossible command: %u, %p\n",
|
||||||
cmd->verb, cmd->obj.ptr);
|
cmd->verb, cmd->obj.ptr);
|
||||||
break;
|
break;
|
||||||
};
|
}
|
||||||
|
|
||||||
if (error)
|
if (error)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -629,7 +629,7 @@ sctp_disposition_t sctp_sf_do_5_1D_ce(const struct sctp_endpoint *ep,
|
|||||||
case -SCTP_IERROR_BAD_SIG:
|
case -SCTP_IERROR_BAD_SIG:
|
||||||
default:
|
default:
|
||||||
return sctp_sf_pdiscard(ep, asoc, type, arg, commands);
|
return sctp_sf_pdiscard(ep, asoc, type, arg, commands);
|
||||||
};
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -1195,7 +1195,7 @@ static void sctp_tietags_populate(struct sctp_association *new_asoc,
|
|||||||
new_asoc->c.my_ttag = asoc->c.my_vtag;
|
new_asoc->c.my_ttag = asoc->c.my_vtag;
|
||||||
new_asoc->c.peer_ttag = asoc->c.peer_vtag;
|
new_asoc->c.peer_ttag = asoc->c.peer_vtag;
|
||||||
break;
|
break;
|
||||||
};
|
}
|
||||||
|
|
||||||
/* Other parameters for the endpoint SHOULD be copied from the
|
/* Other parameters for the endpoint SHOULD be copied from the
|
||||||
* existing parameters of the association (e.g. number of
|
* existing parameters of the association (e.g. number of
|
||||||
@ -1904,7 +1904,7 @@ sctp_disposition_t sctp_sf_do_5_2_4_dupcook(const struct sctp_endpoint *ep,
|
|||||||
case -SCTP_IERROR_BAD_SIG:
|
case -SCTP_IERROR_BAD_SIG:
|
||||||
default:
|
default:
|
||||||
return sctp_sf_pdiscard(ep, asoc, type, arg, commands);
|
return sctp_sf_pdiscard(ep, asoc, type, arg, commands);
|
||||||
};
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Compare the tie_tag in cookie with the verification tag of
|
/* Compare the tie_tag in cookie with the verification tag of
|
||||||
@ -1936,7 +1936,7 @@ sctp_disposition_t sctp_sf_do_5_2_4_dupcook(const struct sctp_endpoint *ep,
|
|||||||
default: /* Discard packet for all others. */
|
default: /* Discard packet for all others. */
|
||||||
retval = sctp_sf_pdiscard(ep, asoc, type, arg, commands);
|
retval = sctp_sf_pdiscard(ep, asoc, type, arg, commands);
|
||||||
break;
|
break;
|
||||||
};
|
}
|
||||||
|
|
||||||
/* Delete the tempory new association. */
|
/* Delete the tempory new association. */
|
||||||
sctp_add_cmd_sf(commands, SCTP_CMD_NEW_ASOC, SCTP_ASOC(new_asoc));
|
sctp_add_cmd_sf(commands, SCTP_CMD_NEW_ASOC, SCTP_ASOC(new_asoc));
|
||||||
@ -4816,7 +4816,7 @@ sctp_disposition_t sctp_sf_t2_timer_expire(const struct sctp_endpoint *ep,
|
|||||||
default:
|
default:
|
||||||
BUG();
|
BUG();
|
||||||
break;
|
break;
|
||||||
};
|
}
|
||||||
|
|
||||||
if (!reply)
|
if (!reply)
|
||||||
goto nomem;
|
goto nomem;
|
||||||
|
@ -101,7 +101,7 @@ const sctp_sm_table_entry_t *sctp_sm_lookup_event(sctp_event_t event_type,
|
|||||||
default:
|
default:
|
||||||
/* Yikes! We got an illegal event type. */
|
/* Yikes! We got an illegal event type. */
|
||||||
return &bug;
|
return &bug;
|
||||||
};
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#define TYPE_SCTP_FUNC(func) {.fn = func, .name = #func}
|
#define TYPE_SCTP_FUNC(func) {.fn = func, .name = #func}
|
||||||
|
@ -941,7 +941,7 @@ SCTP_STATIC int sctp_setsockopt_bindx(struct sock* sk,
|
|||||||
default:
|
default:
|
||||||
err = -EINVAL;
|
err = -EINVAL;
|
||||||
break;
|
break;
|
||||||
};
|
}
|
||||||
|
|
||||||
out:
|
out:
|
||||||
kfree(kaddrs);
|
kfree(kaddrs);
|
||||||
@ -3048,7 +3048,7 @@ SCTP_STATIC int sctp_setsockopt(struct sock *sk, int level, int optname,
|
|||||||
default:
|
default:
|
||||||
retval = -ENOPROTOOPT;
|
retval = -ENOPROTOOPT;
|
||||||
break;
|
break;
|
||||||
};
|
}
|
||||||
|
|
||||||
sctp_release_sock(sk);
|
sctp_release_sock(sk);
|
||||||
|
|
||||||
@ -4873,7 +4873,7 @@ SCTP_STATIC int sctp_getsockopt(struct sock *sk, int level, int optname,
|
|||||||
default:
|
default:
|
||||||
retval = -ENOPROTOOPT;
|
retval = -ENOPROTOOPT;
|
||||||
break;
|
break;
|
||||||
};
|
}
|
||||||
|
|
||||||
sctp_release_sock(sk);
|
sctp_release_sock(sk);
|
||||||
return retval;
|
return retval;
|
||||||
@ -5198,7 +5198,8 @@ int sctp_inet_listen(struct socket *sock, int backlog)
|
|||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
};
|
}
|
||||||
|
|
||||||
if (err)
|
if (err)
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
|
|
||||||
@ -5461,7 +5462,7 @@ SCTP_STATIC int sctp_msghdr_parse(const struct msghdr *msg,
|
|||||||
|
|
||||||
default:
|
default:
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
};
|
}
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -507,7 +507,7 @@ void sctp_transport_lower_cwnd(struct sctp_transport *transport,
|
|||||||
transport->cwnd = max(transport->cwnd/2,
|
transport->cwnd = max(transport->cwnd/2,
|
||||||
4*transport->asoc->pathmtu);
|
4*transport->asoc->pathmtu);
|
||||||
break;
|
break;
|
||||||
};
|
}
|
||||||
|
|
||||||
transport->partial_bytes_acked = 0;
|
transport->partial_bytes_acked = 0;
|
||||||
SCTP_DEBUG_PRINTK("%s: transport: %p reason: %d cwnd: "
|
SCTP_DEBUG_PRINTK("%s: transport: %p reason: %d cwnd: "
|
||||||
|
@ -391,7 +391,7 @@ static struct sctp_ulpevent *sctp_make_reassembled_event(struct sk_buff_head *qu
|
|||||||
break;
|
break;
|
||||||
pos->next = pnext;
|
pos->next = pnext;
|
||||||
pos = pnext;
|
pos = pnext;
|
||||||
};
|
}
|
||||||
|
|
||||||
event = sctp_skb2event(f_frag);
|
event = sctp_skb2event(f_frag);
|
||||||
SCTP_INC_STATS(SCTP_MIB_REASMUSRMSGS);
|
SCTP_INC_STATS(SCTP_MIB_REASMUSRMSGS);
|
||||||
@ -476,7 +476,7 @@ static inline struct sctp_ulpevent *sctp_ulpq_retrieve_reassembled(struct sctp_u
|
|||||||
else
|
else
|
||||||
first_frag = NULL;
|
first_frag = NULL;
|
||||||
break;
|
break;
|
||||||
};
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
asoc = ulpq->asoc;
|
asoc = ulpq->asoc;
|
||||||
@ -556,7 +556,7 @@ static inline struct sctp_ulpevent *sctp_ulpq_retrieve_partial(struct sctp_ulpq
|
|||||||
goto done;
|
goto done;
|
||||||
default:
|
default:
|
||||||
return NULL;
|
return NULL;
|
||||||
};
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* We have the reassembled event. There is no need to look
|
/* We have the reassembled event. There is no need to look
|
||||||
@ -648,7 +648,7 @@ static inline struct sctp_ulpevent *sctp_ulpq_retrieve_first(struct sctp_ulpq *u
|
|||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
return NULL;
|
return NULL;
|
||||||
};
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* We have the reassembled event. There is no need to look
|
/* We have the reassembled event. There is no need to look
|
||||||
|
@ -2570,7 +2570,7 @@ void tipc_link_recv_bundle(struct sk_buff *buf)
|
|||||||
if (obuf == NULL) {
|
if (obuf == NULL) {
|
||||||
warn("Link unable to unbundle message(s)\n");
|
warn("Link unable to unbundle message(s)\n");
|
||||||
break;
|
break;
|
||||||
};
|
}
|
||||||
pos += align(msg_size(buf_msg(obuf)));
|
pos += align(msg_size(buf_msg(obuf)));
|
||||||
msg_dbg(buf_msg(obuf), " /");
|
msg_dbg(buf_msg(obuf), " /");
|
||||||
tipc_net_route_msg(obuf);
|
tipc_net_route_msg(obuf);
|
||||||
|
@ -1049,7 +1049,7 @@ static inline int policy_to_flow_dir(int dir)
|
|||||||
return FLOW_DIR_OUT;
|
return FLOW_DIR_OUT;
|
||||||
case XFRM_POLICY_FWD:
|
case XFRM_POLICY_FWD:
|
||||||
return FLOW_DIR_FWD;
|
return FLOW_DIR_FWD;
|
||||||
};
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct xfrm_policy *xfrm_sk_policy_lookup(struct sock *sk, int dir, struct flowi *fl)
|
static struct xfrm_policy *xfrm_sk_policy_lookup(struct sock *sk, int dir, struct flowi *fl)
|
||||||
|
@ -458,7 +458,7 @@ static struct xfrm_state *__xfrm_state_lookup(xfrm_address_t *daddr, __be32 spi,
|
|||||||
x->id.daddr.a6))
|
x->id.daddr.a6))
|
||||||
continue;
|
continue;
|
||||||
break;
|
break;
|
||||||
};
|
}
|
||||||
|
|
||||||
xfrm_state_hold(x);
|
xfrm_state_hold(x);
|
||||||
return x;
|
return x;
|
||||||
@ -493,7 +493,7 @@ static struct xfrm_state *__xfrm_state_lookup_byaddr(xfrm_address_t *daddr, xfrm
|
|||||||
x->props.saddr.a6))
|
x->props.saddr.a6))
|
||||||
continue;
|
continue;
|
||||||
break;
|
break;
|
||||||
};
|
}
|
||||||
|
|
||||||
xfrm_state_hold(x);
|
xfrm_state_hold(x);
|
||||||
return x;
|
return x;
|
||||||
@ -722,7 +722,7 @@ static struct xfrm_state *__find_acq_core(unsigned short family, u8 mode, u32 re
|
|||||||
(struct in6_addr *)saddr))
|
(struct in6_addr *)saddr))
|
||||||
continue;
|
continue;
|
||||||
break;
|
break;
|
||||||
};
|
}
|
||||||
|
|
||||||
xfrm_state_hold(x);
|
xfrm_state_hold(x);
|
||||||
return x;
|
return x;
|
||||||
@ -755,7 +755,7 @@ static struct xfrm_state *__find_acq_core(unsigned short family, u8 mode, u32 re
|
|||||||
ipv6_addr_copy((struct in6_addr *)x->id.daddr.a6,
|
ipv6_addr_copy((struct in6_addr *)x->id.daddr.a6,
|
||||||
(struct in6_addr *)daddr);
|
(struct in6_addr *)daddr);
|
||||||
break;
|
break;
|
||||||
};
|
}
|
||||||
|
|
||||||
x->km.state = XFRM_STATE_ACQ;
|
x->km.state = XFRM_STATE_ACQ;
|
||||||
x->id.proto = proto;
|
x->id.proto = proto;
|
||||||
|
@ -71,7 +71,7 @@ static int verify_one_alg(struct rtattr **xfrma, enum xfrm_attr_type_t type)
|
|||||||
|
|
||||||
default:
|
default:
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
};
|
}
|
||||||
|
|
||||||
algp->alg_name[CRYPTO_MAX_ALG_NAME - 1] = '\0';
|
algp->alg_name[CRYPTO_MAX_ALG_NAME - 1] = '\0';
|
||||||
return 0;
|
return 0;
|
||||||
@ -152,7 +152,7 @@ static int verify_newsa_info(struct xfrm_usersa_info *p,
|
|||||||
|
|
||||||
default:
|
default:
|
||||||
goto out;
|
goto out;
|
||||||
};
|
}
|
||||||
|
|
||||||
err = -EINVAL;
|
err = -EINVAL;
|
||||||
switch (p->id.proto) {
|
switch (p->id.proto) {
|
||||||
@ -192,7 +192,7 @@ static int verify_newsa_info(struct xfrm_usersa_info *p,
|
|||||||
|
|
||||||
default:
|
default:
|
||||||
goto out;
|
goto out;
|
||||||
};
|
}
|
||||||
|
|
||||||
if ((err = verify_one_alg(xfrma, XFRMA_ALG_AUTH)))
|
if ((err = verify_one_alg(xfrma, XFRMA_ALG_AUTH)))
|
||||||
goto out;
|
goto out;
|
||||||
@ -217,7 +217,7 @@ static int verify_newsa_info(struct xfrm_usersa_info *p,
|
|||||||
|
|
||||||
default:
|
default:
|
||||||
goto out;
|
goto out;
|
||||||
};
|
}
|
||||||
|
|
||||||
err = 0;
|
err = 0;
|
||||||
|
|
||||||
@ -711,7 +711,7 @@ static int verify_userspi_info(struct xfrm_userspi_info *p)
|
|||||||
|
|
||||||
default:
|
default:
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
};
|
}
|
||||||
|
|
||||||
if (p->min > p->max)
|
if (p->min > p->max)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
@ -789,7 +789,7 @@ static int verify_policy_dir(u8 dir)
|
|||||||
|
|
||||||
default:
|
default:
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
};
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@ -805,7 +805,7 @@ static int verify_policy_type(u8 type)
|
|||||||
|
|
||||||
default:
|
default:
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
};
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@ -821,7 +821,7 @@ static int verify_newpolicy_info(struct xfrm_userpolicy_info *p)
|
|||||||
|
|
||||||
default:
|
default:
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
};
|
}
|
||||||
|
|
||||||
switch (p->action) {
|
switch (p->action) {
|
||||||
case XFRM_POLICY_ALLOW:
|
case XFRM_POLICY_ALLOW:
|
||||||
@ -830,7 +830,7 @@ static int verify_newpolicy_info(struct xfrm_userpolicy_info *p)
|
|||||||
|
|
||||||
default:
|
default:
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
};
|
}
|
||||||
|
|
||||||
switch (p->sel.family) {
|
switch (p->sel.family) {
|
||||||
case AF_INET:
|
case AF_INET:
|
||||||
@ -845,7 +845,7 @@ static int verify_newpolicy_info(struct xfrm_userpolicy_info *p)
|
|||||||
|
|
||||||
default:
|
default:
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
};
|
}
|
||||||
|
|
||||||
return verify_policy_dir(p->dir);
|
return verify_policy_dir(p->dir);
|
||||||
}
|
}
|
||||||
@ -912,7 +912,7 @@ static int validate_tmpl(int nr, struct xfrm_user_tmpl *ut, u16 family)
|
|||||||
#endif
|
#endif
|
||||||
default:
|
default:
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
};
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
Loading…
Reference in New Issue
Block a user