|
@@ -189,7 +189,7 @@ static int ipmr_rule_action(struct fib_rule *rule, struct flowi *flp,
|
|
|
}
|
|
|
|
|
|
mrt = ipmr_get_table(rule->fr_net, rule->table);
|
|
|
- if (mrt == NULL)
|
|
|
+ if (!mrt)
|
|
|
return -EAGAIN;
|
|
|
res->mrt = mrt;
|
|
|
return 0;
|
|
@@ -253,7 +253,7 @@ static int __net_init ipmr_rules_init(struct net *net)
|
|
|
INIT_LIST_HEAD(&net->ipv4.mr_tables);
|
|
|
|
|
|
mrt = ipmr_new_table(net, RT_TABLE_DEFAULT);
|
|
|
- if (mrt == NULL) {
|
|
|
+ if (!mrt) {
|
|
|
err = -ENOMEM;
|
|
|
goto err1;
|
|
|
}
|
|
@@ -320,7 +320,7 @@ static struct mr_table *ipmr_new_table(struct net *net, u32 id)
|
|
|
return mrt;
|
|
|
|
|
|
mrt = kzalloc(sizeof(*mrt), GFP_KERNEL);
|
|
|
- if (mrt == NULL)
|
|
|
+ if (!mrt)
|
|
|
return NULL;
|
|
|
write_pnet(&mrt->net, net);
|
|
|
mrt->id = id;
|
|
@@ -422,7 +422,7 @@ struct net_device *ipmr_new_tunnel(struct net *net, struct vifctl *v)
|
|
|
dev->flags |= IFF_MULTICAST;
|
|
|
|
|
|
in_dev = __in_dev_get_rtnl(dev);
|
|
|
- if (in_dev == NULL)
|
|
|
+ if (!in_dev)
|
|
|
goto failure;
|
|
|
|
|
|
ipv4_devconf_setall(in_dev);
|
|
@@ -506,7 +506,7 @@ static struct net_device *ipmr_reg_vif(struct net *net, struct mr_table *mrt)
|
|
|
|
|
|
dev = alloc_netdev(0, name, NET_NAME_UNKNOWN, reg_vif_setup);
|
|
|
|
|
|
- if (dev == NULL)
|
|
|
+ if (!dev)
|
|
|
return NULL;
|
|
|
|
|
|
dev_net_set(dev, net);
|
|
@@ -762,7 +762,7 @@ static int vif_add(struct net *net, struct mr_table *mrt,
|
|
|
case 0:
|
|
|
if (vifc->vifc_flags == VIFF_USE_IFINDEX) {
|
|
|
dev = dev_get_by_index(net, vifc->vifc_lcl_ifindex);
|
|
|
- if (dev && __in_dev_get_rtnl(dev) == NULL) {
|
|
|
+ if (dev && !__in_dev_get_rtnl(dev)) {
|
|
|
dev_put(dev);
|
|
|
return -EADDRNOTAVAIL;
|
|
|
}
|
|
@@ -1008,7 +1008,7 @@ static int ipmr_cache_report(struct mr_table *mrt,
|
|
|
|
|
|
rcu_read_lock();
|
|
|
mroute_sk = rcu_dereference(mrt->mroute_sk);
|
|
|
- if (mroute_sk == NULL) {
|
|
|
+ if (!mroute_sk) {
|
|
|
rcu_read_unlock();
|
|
|
kfree_skb(skb);
|
|
|
return -EINVAL;
|
|
@@ -1161,7 +1161,7 @@ static int ipmr_mfc_add(struct net *net, struct mr_table *mrt,
|
|
|
return -EINVAL;
|
|
|
|
|
|
c = ipmr_cache_alloc();
|
|
|
- if (c == NULL)
|
|
|
+ if (!c)
|
|
|
return -ENOMEM;
|
|
|
|
|
|
c->mfc_origin = mfc->mfcc_origin.s_addr;
|
|
@@ -1283,7 +1283,7 @@ int ip_mroute_setsockopt(struct sock *sk, int optname, char __user *optval, unsi
|
|
|
return -EOPNOTSUPP;
|
|
|
|
|
|
mrt = ipmr_get_table(net, raw_sk(sk)->ipmr_table ? : RT_TABLE_DEFAULT);
|
|
|
- if (mrt == NULL)
|
|
|
+ if (!mrt)
|
|
|
return -ENOENT;
|
|
|
|
|
|
if (optname != MRT_INIT) {
|
|
@@ -1446,7 +1446,7 @@ int ip_mroute_getsockopt(struct sock *sk, int optname, char __user *optval, int
|
|
|
return -EOPNOTSUPP;
|
|
|
|
|
|
mrt = ipmr_get_table(net, raw_sk(sk)->ipmr_table ? : RT_TABLE_DEFAULT);
|
|
|
- if (mrt == NULL)
|
|
|
+ if (!mrt)
|
|
|
return -ENOENT;
|
|
|
|
|
|
if (optname != MRT_VERSION &&
|
|
@@ -1492,7 +1492,7 @@ int ipmr_ioctl(struct sock *sk, int cmd, void __user *arg)
|
|
|
struct mr_table *mrt;
|
|
|
|
|
|
mrt = ipmr_get_table(net, raw_sk(sk)->ipmr_table ? : RT_TABLE_DEFAULT);
|
|
|
- if (mrt == NULL)
|
|
|
+ if (!mrt)
|
|
|
return -ENOENT;
|
|
|
|
|
|
switch (cmd) {
|
|
@@ -1566,7 +1566,7 @@ int ipmr_compat_ioctl(struct sock *sk, unsigned int cmd, void __user *arg)
|
|
|
struct mr_table *mrt;
|
|
|
|
|
|
mrt = ipmr_get_table(net, raw_sk(sk)->ipmr_table ? : RT_TABLE_DEFAULT);
|
|
|
- if (mrt == NULL)
|
|
|
+ if (!mrt)
|
|
|
return -ENOENT;
|
|
|
|
|
|
switch (cmd) {
|
|
@@ -1701,7 +1701,7 @@ static void ipmr_queue_xmit(struct net *net, struct mr_table *mrt,
|
|
|
struct flowi4 fl4;
|
|
|
int encap = 0;
|
|
|
|
|
|
- if (vif->dev == NULL)
|
|
|
+ if (!vif->dev)
|
|
|
goto out_free;
|
|
|
|
|
|
#ifdef CONFIG_IP_PIMSM
|
|
@@ -1992,7 +1992,7 @@ int ip_mr_input(struct sk_buff *skb)
|
|
|
|
|
|
/* already under rcu_read_lock() */
|
|
|
cache = ipmr_cache_find(mrt, ip_hdr(skb)->saddr, ip_hdr(skb)->daddr);
|
|
|
- if (cache == NULL) {
|
|
|
+ if (!cache) {
|
|
|
int vif = ipmr_find_vif(mrt, skb->dev);
|
|
|
|
|
|
if (vif >= 0)
|
|
@@ -2003,13 +2003,13 @@ int ip_mr_input(struct sk_buff *skb)
|
|
|
/*
|
|
|
* No usable cache entry
|
|
|
*/
|
|
|
- if (cache == NULL) {
|
|
|
+ if (!cache) {
|
|
|
int vif;
|
|
|
|
|
|
if (local) {
|
|
|
struct sk_buff *skb2 = skb_clone(skb, GFP_ATOMIC);
|
|
|
ip_local_deliver(skb);
|
|
|
- if (skb2 == NULL)
|
|
|
+ if (!skb2)
|
|
|
return -ENOBUFS;
|
|
|
skb = skb2;
|
|
|
}
|
|
@@ -2068,7 +2068,7 @@ static int __pim_rcv(struct mr_table *mrt, struct sk_buff *skb,
|
|
|
reg_dev = mrt->vif_table[mrt->mroute_reg_vif_num].dev;
|
|
|
read_unlock(&mrt_lock);
|
|
|
|
|
|
- if (reg_dev == NULL)
|
|
|
+ if (!reg_dev)
|
|
|
return 1;
|
|
|
|
|
|
skb->mac_header = skb->network_header;
|
|
@@ -2198,18 +2198,18 @@ int ipmr_get_route(struct net *net, struct sk_buff *skb,
|
|
|
int err;
|
|
|
|
|
|
mrt = ipmr_get_table(net, RT_TABLE_DEFAULT);
|
|
|
- if (mrt == NULL)
|
|
|
+ if (!mrt)
|
|
|
return -ENOENT;
|
|
|
|
|
|
rcu_read_lock();
|
|
|
cache = ipmr_cache_find(mrt, saddr, daddr);
|
|
|
- if (cache == NULL && skb->dev) {
|
|
|
+ if (!cache && skb->dev) {
|
|
|
int vif = ipmr_find_vif(mrt, skb->dev);
|
|
|
|
|
|
if (vif >= 0)
|
|
|
cache = ipmr_cache_find_any(mrt, daddr, vif);
|
|
|
}
|
|
|
- if (cache == NULL) {
|
|
|
+ if (!cache) {
|
|
|
struct sk_buff *skb2;
|
|
|
struct iphdr *iph;
|
|
|
struct net_device *dev;
|
|
@@ -2267,7 +2267,7 @@ static int ipmr_fill_mroute(struct mr_table *mrt, struct sk_buff *skb,
|
|
|
int err;
|
|
|
|
|
|
nlh = nlmsg_put(skb, portid, seq, cmd, sizeof(*rtm), flags);
|
|
|
- if (nlh == NULL)
|
|
|
+ if (!nlh)
|
|
|
return -EMSGSIZE;
|
|
|
|
|
|
rtm = nlmsg_data(nlh);
|
|
@@ -2332,7 +2332,7 @@ static void mroute_netlink_event(struct mr_table *mrt, struct mfc_cache *mfc,
|
|
|
|
|
|
skb = nlmsg_new(mroute_msgsize(mfc->mfc_parent >= MAXVIFS, mrt->maxvif),
|
|
|
GFP_ATOMIC);
|
|
|
- if (skb == NULL)
|
|
|
+ if (!skb)
|
|
|
goto errout;
|
|
|
|
|
|
err = ipmr_fill_mroute(mrt, skb, 0, 0, mfc, cmd, 0);
|
|
@@ -2447,7 +2447,7 @@ static void *ipmr_vif_seq_start(struct seq_file *seq, loff_t *pos)
|
|
|
struct mr_table *mrt;
|
|
|
|
|
|
mrt = ipmr_get_table(net, RT_TABLE_DEFAULT);
|
|
|
- if (mrt == NULL)
|
|
|
+ if (!mrt)
|
|
|
return ERR_PTR(-ENOENT);
|
|
|
|
|
|
iter->mrt = mrt;
|
|
@@ -2566,7 +2566,7 @@ static void *ipmr_mfc_seq_start(struct seq_file *seq, loff_t *pos)
|
|
|
struct mr_table *mrt;
|
|
|
|
|
|
mrt = ipmr_get_table(net, RT_TABLE_DEFAULT);
|
|
|
- if (mrt == NULL)
|
|
|
+ if (!mrt)
|
|
|
return ERR_PTR(-ENOENT);
|
|
|
|
|
|
it->mrt = mrt;
|