diff for duplicates of <bdd41a34-143a-b075-dca8-e43199abdbd1@users.sourceforge.net> diff --git a/a/1.txt b/N1/1.txt index 9ddf250..0efd7f8 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -29,7 +29,7 @@ index f5b601c01f38..d3f8ec90556a 100644 struct sk_buff *skb2 = skb_realloc_headroom(skb, minheadroom); brvcc->copies_needed++; dev_kfree_skb(skb); -- if (skb2 = NULL) { +- if (skb2 == NULL) { + if (!skb2) { brvcc->copies_failed++; return 0; @@ -38,7 +38,7 @@ index f5b601c01f38..d3f8ec90556a 100644 pr_debug("skb_dst(skb)=%p\n", skb_dst(skb)); read_lock(&devs_lock); brvcc = pick_outgoing_vcc(skb, brdev); -- if (brvcc = NULL) { +- if (brvcc == NULL) { + if (!brvcc) { pr_debug("no vcc attached to dev %s\n", dev->name); dev->stats.tx_errors++; @@ -47,14 +47,14 @@ index f5b601c01f38..d3f8ec90556a 100644 struct br2684_dev *brdev; read_lock(&devs_lock); brdev = BRPRIV(br2684_find_dev(&fs.ifspec)); -- if (brdev = NULL || list_empty(&brdev->brvccs) || +- if (brdev == NULL || list_empty(&brdev->brvccs) || + if (!brdev || list_empty(&brdev->brvccs) || brdev->brvccs.next != brdev->brvccs.prev) /* >1 VCC */ brvcc = NULL; else brvcc = list_entry_brvcc(brdev->brvccs.next); read_unlock(&devs_lock); -- if (brvcc = NULL) +- if (brvcc == NULL) + if (!brvcc) return -ESRCH; } else @@ -64,23 +64,23 @@ index f5b601c01f38..d3f8ec90556a 100644 pr_debug("\n"); - -- if (unlikely(skb = NULL)) { +- if (unlikely(skb == NULL)) { + if (unlikely(!skb)) { - /* skb=NULL means VCC is being destroyed */ + /* skb==NULL means VCC is being destroyed */ br2684_close_vcc(brvcc); if (list_empty(&brdev->brvccs)) { @@ -550,13 +549,13 @@ static int br2684_regvcc(struct atm_vcc *atmvcc, void __user * arg) atomic_set(&brvcc->qspace, 2); write_lock_irq(&devs_lock); net_dev = br2684_find_dev(&be.ifspec); -- if (net_dev = NULL) { +- if (net_dev == NULL) { + if (!net_dev) { pr_err("tried to attach to non-existent device\n"); err = -ENXIO; goto error; } brdev = BRPRIV(net_dev); -- if (atmvcc->push = NULL) { +- if (atmvcc->push == NULL) { + if (!atmvcc->push) { err = -EBADFD; goto error; @@ -89,7 +89,7 @@ index f5b601c01f38..d3f8ec90556a 100644 #ifdef CONFIG_PROC_FS struct proc_dir_entry *p; p = proc_create("br2684", 0, atm_proc_root, &br2684_proc_ops); -- if (p = NULL) +- if (p == NULL) + if (!p) return -ENOMEM; #endif @@ -115,7 +115,7 @@ index 74a794602412..4f94c6ed893c 100644 struct atmlec_msg *mesg; skb2 = alloc_skb(sizeof(struct atmlec_msg), GFP_ATOMIC); -- if (skb2 = NULL) +- if (skb2 == NULL) + if (!skb2) return; skb2->len = sizeof(struct atmlec_msg); @@ -124,7 +124,7 @@ index 74a794602412..4f94c6ed893c 100644 min_frame_size - skb->truesize, GFP_ATOMIC); dev_kfree_skb(skb); -- if (skb2 = NULL) { +- if (skb2 == NULL) { + if (!skb2) { dev->stats.tx_dropped++; return NETDEV_TX_OK; @@ -133,7 +133,7 @@ index 74a794602412..4f94c6ed893c 100644 pr_debug("%s: bridge zeppelin asks about %pM\n", dev->name, mesg->content.proxy.mac_addr); -- if (br_fdb_test_addr_hook = NULL) +- if (br_fdb_test_addr_hook == NULL) + if (!br_fdb_test_addr_hook) break; @@ -142,7 +142,7 @@ index 74a794602412..4f94c6ed893c 100644 pr_debug("%s: entry found, responding to zeppelin\n", dev->name); skb2 = alloc_skb(sizeof(struct atmlec_msg), GFP_ATOMIC); -- if (skb2 = NULL) +- if (skb2 == NULL) + if (!skb2) break; skb2->len = sizeof(struct atmlec_msg); @@ -169,7 +169,7 @@ index 74a794602412..4f94c6ed893c 100644 struct lec_vcc_priv *vpriv = LEC_VCC_PRIV(vcc); struct net_device *dev = skb->dev; -- if (vpriv = NULL) { +- if (vpriv == NULL) { + if (!vpriv) { pr_info("vpriv = NULL!?!?!?\n"); return; @@ -187,12 +187,12 @@ index 74a794602412..4f94c6ed893c 100644 spin_lock_irqsave(&priv->lec_arp_lock, flags); table = lec_arp_find(priv, dst_mac); spin_unlock_irqrestore(&priv->lec_arp_lock, flags); -- if (table = NULL) +- if (table == NULL) + if (!table) return -1; *tlvs = kmemdup(table->tlvs, table->sizeoftlvs, GFP_ATOMIC); -- if (*tlvs = NULL) +- if (*tlvs == NULL) + if (!*tlvs) return -1; @@ -201,13 +201,13 @@ index 74a794602412..4f94c6ed893c 100644 return 0; } -- if (sizeoftlvs = NULL) +- if (sizeoftlvs == NULL) + if (!sizeoftlvs) retval = send_to_lecd(priv, l_arp_xmt, dst_mac, NULL, NULL); else { skb = alloc_skb(*sizeoftlvs, GFP_ATOMIC); -- if (skb = NULL) +- if (skb == NULL) + if (!skb) return -1; skb->len = *sizeoftlvs; @@ -216,13 +216,13 @@ index 74a794602412..4f94c6ed893c 100644 kfree(priv->tlvs); /* NULL if there was no previous association */ priv->tlvs = kmemdup(tlvs, sizeoftlvs, GFP_KERNEL); -- if (priv->tlvs = NULL) +- if (priv->tlvs == NULL) + if (!priv->tlvs) return 0; priv->sizeoftlvs = sizeoftlvs; skb = alloc_skb(sizeoftlvs, GFP_ATOMIC); -- if (skb = NULL) +- if (skb == NULL) + if (!skb) return 0; skb->len = sizeoftlvs; @@ -231,14 +231,14 @@ index 74a794602412..4f94c6ed893c 100644 */ struct lec_arp_table *entry = lec_arp_find(priv, mac_addr); -- if (entry = NULL) +- if (entry == NULL) + if (!entry) return; /* should not happen */ kfree(entry->tlvs); entry->tlvs = kmemdup(tlvs, sizeoftlvs, GFP_KERNEL); -- if (entry->tlvs = NULL) +- if (entry->tlvs == NULL) + if (!entry->tlvs) return; entry->sizeoftlvs = sizeoftlvs; @@ -247,7 +247,7 @@ index 74a794602412..4f94c6ed893c 100644 spin_lock_irqsave(&priv->lec_arp_lock, flags); entry = lec_arp_find(priv, mac_addr); -- if (entry = NULL && targetless_le_arp) +- if (entry == NULL && targetless_le_arp) + if (!entry && targetless_le_arp) goto out; /* * LANE2: ignore targetless LE_ARPs for which @@ -256,7 +256,7 @@ index 74a794602412..4f94c6ed893c 100644 entry->old_recv_push = old_push; #endif entry = make_entry(priv, bus_mac); -- if (entry = NULL) +- if (entry == NULL) + if (!entry) goto out; del_timer(&entry->timer); @@ -265,7 +265,7 @@ index 74a794602412..4f94c6ed893c 100644 ioc_data->atm_addr[16], ioc_data->atm_addr[17], ioc_data->atm_addr[18], ioc_data->atm_addr[19]); entry = make_entry(priv, bus_mac); -- if (entry = NULL) +- if (entry == NULL) + if (!entry) goto out; memcpy(entry->atm_addr, ioc_data->atm_addr, ATM_ESA_LEN); @@ -280,7 +280,7 @@ index d6729d797107..ece715f8c9f7 100644 mpc = mpcs; /* our global linked list */ - while (mpc != NULL) { + while (mpc) { - if (mpc->dev_num = itf) + if (mpc->dev_num == itf) return mpc; mpc = mpc->next; @@ -143,7 +143,7 @@ static struct mpoa_client *find_mpc_by_vcc(struct atm_vcc *vcc) @@ -289,7 +289,7 @@ index d6729d797107..ece715f8c9f7 100644 mpc = mpcs; /* our global linked list */ - while (mpc != NULL) { + while (mpc) { - if (mpc->mpoad_vcc = vcc) + if (mpc->mpoad_vcc == vcc) return mpc; mpc = mpc->next; @@ -157,7 +157,7 @@ static struct mpoa_client *find_mpc_by_lec(struct net_device *dev) @@ -298,7 +298,7 @@ index d6729d797107..ece715f8c9f7 100644 mpc = mpcs; /* our global linked list */ - while (mpc != NULL) { + while (mpc) { - if (mpc->dev = dev) + if (mpc->dev == dev) return mpc; mpc = mpc->next; @@ -178,7 +178,7 @@ struct atm_mpoa_qos *atm_mpoa_add_qos(__be32 dst_ip, struct atm_qos *qos) @@ -314,10 +314,10 @@ index d6729d797107..ece715f8c9f7 100644 { struct atm_mpoa_qos *curr; -- if (entry = NULL) +- if (entry == NULL) + if (!entry) return 0; - if (entry = qos_head) { + if (entry == qos_head) { qos_head = qos_head->next; @@ -226,7 +226,7 @@ int atm_mpoa_delete_qos(struct atm_mpoa_qos *entry) } @@ -325,7 +325,7 @@ index d6729d797107..ece715f8c9f7 100644 curr = qos_head; - while (curr != NULL) { + while (curr) { - if (curr->next = entry) { + if (curr->next == entry) { curr->next = entry->next; kfree(entry); @@ -247,7 +247,7 @@ void atm_mpoa_disp_qos(struct seq_file *m) @@ -341,7 +341,7 @@ index d6729d797107..ece715f8c9f7 100644 struct mpoa_client *mpc; mpc = kzalloc(sizeof(*mpc), GFP_KERNEL); -- if (mpc = NULL) +- if (mpc == NULL) + if (!mpc) return NULL; rwlock_init(&mpc->ingress_lock); @@ -350,7 +350,7 @@ index d6729d797107..ece715f8c9f7 100644 dprintk("(%s) received TLV(s), ", dev->name); dprintk("total length of all TLVs %d\n", sizeoftlvs); mpc = find_mpc_by_lec(dev); /* Sampo-Fix: moved here from below */ -- if (mpc = NULL) { +- if (mpc == NULL) { + if (!mpc) { pr_info("(%s) no mpc\n", dev->name); return; @@ -359,7 +359,7 @@ index d6729d797107..ece715f8c9f7 100644 tlvs = copy_macs(mpc, mac_addr, tlvs, number_of_mps_macs, mpoa_device_type); -- if (tlvs = NULL) +- if (tlvs == NULL) + if (!tlvs) return; } @@ -368,7 +368,7 @@ index d6729d797107..ece715f8c9f7 100644 mpc->dev->name, ipaddr); entry = mpc->in_ops->get(ipaddr, mpc); -- if (entry = NULL) { +- if (entry == NULL) { + if (!entry) { entry = mpc->in_ops->add_entry(ipaddr, mpc); - if (entry != NULL) @@ -380,7 +380,7 @@ index d6729d797107..ece715f8c9f7 100644 int i = 0; mpc = find_mpc_by_lec(dev); /* this should NEVER fail */ -- if (mpc = NULL) { +- if (mpc == NULL) { + if (!mpc) { pr_info("(%s) no MPC found\n", dev->name); goto non_ip; @@ -389,13 +389,13 @@ index d6729d797107..ece715f8c9f7 100644 return -EINVAL; mpc = find_mpc_by_itfnum(ioc_data.dev_num); -- if (mpc = NULL) +- if (mpc == NULL) + if (!mpc) return -EINVAL; - if (ioc_data.type = MPC_SOCKET_INGRESS) { + if (ioc_data.type == MPC_SOCKET_INGRESS) { in_entry = mpc->in_ops->get(ipaddr, mpc); -- if (in_entry = NULL || +- if (in_entry == NULL || + if (!in_entry || in_entry->entry_state < INGRESS_RESOLVED) { pr_info("(%s) did not find RESOLVED entry from ingress cache\n", @@ -409,7 +409,7 @@ index d6729d797107..ece715f8c9f7 100644 eg_cache_entry *eg_entry; mpc = find_mpc_by_lec(dev); -- if (mpc = NULL) { +- if (mpc == NULL) { + if (!mpc) { pr_info("(%s) close for unknown MPC\n", dev->name); return; @@ -418,7 +418,7 @@ index d6729d797107..ece715f8c9f7 100644 mpc->eg_ops->put(eg_entry); } -- if (in_entry = NULL && eg_entry = NULL) +- if (in_entry == NULL && eg_entry == NULL) + if (!in_entry && !eg_entry) dprintk("(%s) unused vcc closed\n", dev->name); } @@ -427,7 +427,7 @@ index d6729d797107..ece715f8c9f7 100644 char *tmp; ddprintk("(%s)\n", dev->name); -- if (skb = NULL) { +- if (skb == NULL) { + if (!skb) { dprintk("(%s) null skb, closing VCC\n", dev->name); mpc_vcc_close(vcc, dev); @@ -436,7 +436,7 @@ index d6729d797107..ece715f8c9f7 100644 atm_return(vcc, skb->truesize); mpc = find_mpc_by_lec(dev); -- if (mpc = NULL) { +- if (mpc == NULL) { + if (!mpc) { pr_info("(%s) unknown MPC\n", dev->name); return; @@ -445,7 +445,7 @@ index d6729d797107..ece715f8c9f7 100644 tag = *(__be32 *)tmp; eg = mpc->eg_ops->get_by_tag(tag, mpc); -- if (eg = NULL) { +- if (eg == NULL) { + if (!eg) { pr_info("mpoa: (%s) Didn't find egress cache entry, tag = %u\n", dev->name, tag); @@ -454,7 +454,7 @@ index d6729d797107..ece715f8c9f7 100644 * See if ingress MPC is using shortcut we opened as a return channel. * This means we have a bi-directional vcc opened by us. */ -- if (eg->shortcut = NULL) { +- if (eg->shortcut == NULL) { + if (!eg->shortcut) { eg->shortcut = vcc; pr_info("(%s) egress SVC in use\n", dev->name); @@ -463,7 +463,7 @@ index d6729d797107..ece715f8c9f7 100644 new_skb = skb_realloc_headroom(skb, eg->ctrl_info.DH_length); /* LLC/SNAP is shorter than MAC header :( */ dev_kfree_skb_any(skb); -- if (new_skb = NULL) { +- if (new_skb == NULL) { + if (!new_skb) { mpc->eg_ops->put(eg); return; @@ -472,7 +472,7 @@ index d6729d797107..ece715f8c9f7 100644 struct lec_priv *priv; int err; -- if (mpcs = NULL) { +- if (mpcs == NULL) { + if (!mpcs) { init_timer(&mpc_timer); mpc_timer_refresh(); @@ -481,11 +481,11 @@ index d6729d797107..ece715f8c9f7 100644 } mpc = find_mpc_by_itfnum(arg); -- if (mpc = NULL) { +- if (mpc == NULL) { + if (!mpc) { dprintk("allocating new mpc for itf %d\n", arg); mpc = alloc_mpc(); -- if (mpc = NULL) +- if (mpc == NULL) + if (!mpc) return -ENOMEM; mpc->dev_num = arg; @@ -494,7 +494,7 @@ index d6729d797107..ece715f8c9f7 100644 struct sk_buff *skb; mpc = find_mpc_by_vcc(vcc); -- if (mpc = NULL) { +- if (mpc == NULL) { + if (!mpc) { pr_info("did not find MPC\n"); return; @@ -503,7 +503,7 @@ index d6729d797107..ece715f8c9f7 100644 struct k_message *mesg = (struct k_message *)skb->data; WARN_ON(refcount_sub_and_test(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc)); -- if (mpc = NULL) { +- if (mpc == NULL) { + if (!mpc) { pr_info("no mpc found\n"); return 0; @@ -512,14 +512,14 @@ index d6729d797107..ece715f8c9f7 100644 struct sk_buff *skb; struct sock *sk; -- if (mpc = NULL || !mpc->mpoad_vcc) { +- if (mpc == NULL || !mpc->mpoad_vcc) { + if (!mpc || !mpc->mpoad_vcc) { pr_info("mesg %d to a non-existent mpoad\n", mesg->type); return -ENXIO; } skb = alloc_skb(sizeof(struct k_message), GFP_ATOMIC); -- if (skb = NULL) +- if (skb == NULL) + if (!skb) return -ENOMEM; skb_put(skb, sizeof(struct k_message)); @@ -528,11 +528,11 @@ index d6729d797107..ece715f8c9f7 100644 break; priv->lane2_ops->associate_indicator = lane2_assoc_ind; mpc = find_mpc_by_itfnum(priv->itfnum); -- if (mpc = NULL) { +- if (mpc == NULL) { + if (!mpc) { dprintk("allocating new mpc for %s\n", dev->name); mpc = alloc_mpc(); -- if (mpc = NULL) { +- if (mpc == NULL) { + if (!mpc) { pr_info("no new mpc"); break; @@ -541,7 +541,7 @@ index d6729d797107..ece715f8c9f7 100644 case NETDEV_UNREGISTER: /* the lec device was deallocated */ mpc = find_mpc_by_lec(dev); -- if (mpc = NULL) +- if (mpc == NULL) + if (!mpc) break; dprintk("device (%s) was deallocated\n", dev->name); @@ -550,7 +550,7 @@ index d6729d797107..ece715f8c9f7 100644 case NETDEV_UP: /* the dev was ifconfig'ed up */ mpc = find_mpc_by_lec(dev); -- if (mpc = NULL) +- if (mpc == NULL) + if (!mpc) break; - if (mpc->mpoad_vcc != NULL) @@ -562,7 +562,7 @@ index d6729d797107..ece715f8c9f7 100644 * upper layer stops */ mpc = find_mpc_by_lec(dev); -- if (mpc = NULL) +- if (mpc == NULL) + if (!mpc) break; - if (mpc->mpoad_vcc != NULL) @@ -574,7 +574,7 @@ index d6729d797107..ece715f8c9f7 100644 in_cache_entry *entry; entry = mpc->in_ops->get(dst_ip, mpc); -- if (entry = NULL) { +- if (entry == NULL) { + if (!entry) { entry = mpc->in_ops->add_entry(dst_ip, mpc); entry->entry_state = INGRESS_RESOLVING; @@ -592,7 +592,7 @@ index d6729d797107..ece715f8c9f7 100644 mpc->dev->name, &dst_ip); ddprintk("(%s) entry = %p", mpc->dev->name, entry); -- if (entry = NULL) { +- if (entry == NULL) { + if (!entry) { pr_info("(%s) ARGH, received res. reply for an entry that doesn't exist.\n", mpc->dev->name); @@ -600,7 +600,7 @@ index d6729d797107..ece715f8c9f7 100644 @@ -1178,13 +1178,13 @@ static void MPOA_res_reply_rcvd(struct k_message *msg, struct mpoa_client *mpc) ddprintk_cont("entry->shortcut = %p\n", entry->shortcut); - if (entry->entry_state = INGRESS_RESOLVING && + if (entry->entry_state == INGRESS_RESOLVING && - entry->shortcut != NULL) { + entry->shortcut) { entry->entry_state = INGRESS_RESOLVED; @@ -617,7 +617,7 @@ index d6729d797107..ece715f8c9f7 100644 __be32 mask = msg->ip_mask; in_cache_entry *entry = mpc->in_ops->get_with_mask(dst_ip, mpc, mask); -- if (entry = NULL) { +- if (entry == NULL) { + if (!entry) { pr_info("(%s) purge for a non-existing entry, ip = %pI4\n", mpc->dev->name, &dst_ip); @@ -635,7 +635,7 @@ index d6729d797107..ece715f8c9f7 100644 __be32 cache_id = msg->content.eg_info.cache_id; eg_cache_entry *entry = mpc->eg_ops->get_by_cache_id(cache_id, mpc); -- if (entry = NULL) { +- if (entry == NULL) { + if (!entry) { dprintk("(%s) purge for a non-existing entry\n", mpc->dev->name); @@ -644,14 +644,14 @@ index d6729d797107..ece715f8c9f7 100644 struct sk_buff *skb; dprintk("entering\n"); -- if (vcc = NULL) { +- if (vcc == NULL) { + if (!vcc) { - pr_info("vcc = NULL\n"); + pr_info("vcc == NULL\n"); return; } skb = alloc_skb(sizeof(struct k_message), GFP_ATOMIC); -- if (skb = NULL) { +- if (skb == NULL) { + if (!skb) { pr_info("out of memory\n"); return; @@ -678,7 +678,7 @@ index d6729d797107..ece715f8c9f7 100644 holding_time = msg->content.eg_info.holding_time; dprintk("(%s) entry = %p, holding_time = %u\n", mpc->dev->name, entry, holding_time); -- if (entry = NULL && holding_time) { +- if (entry == NULL && holding_time) { + if (!entry && holding_time) { entry = mpc->eg_ops->add_entry(msg, mpc); mpc->eg_ops->put(entry); @@ -687,7 +687,7 @@ index d6729d797107..ece715f8c9f7 100644 kfree(client->mps_macs); client->number_of_mps_macs = 0; client->mps_macs = kmemdup(msg->MPS_ctrl, ETH_ALEN, GFP_KERNEL); -- if (client->mps_macs = NULL) { +- if (client->mps_macs == NULL) { + if (!client->mps_macs) { pr_info("out of memory\n"); return; @@ -745,7 +745,7 @@ index 23f36e5a20ee..c147fe916446 100644 entry = client->in_cache; - while (entry != NULL) { + while (entry) { - if (entry->ctrl_info.in_dst_ip = dst_ip) { + if (entry->ctrl_info.in_dst_ip == dst_ip) { refcount_inc(&entry->use); read_unlock_bh(&client->ingress_lock); @@ -59,7 +59,7 @@ static in_cache_entry *in_cache_get_with_mask(__be32 dst_ip, @@ -754,7 +754,7 @@ index 23f36e5a20ee..c147fe916446 100644 entry = client->in_cache; - while (entry != NULL) { + while (entry) { - if ((entry->ctrl_info.in_dst_ip & mask) = (dst_ip & mask)) { + if ((entry->ctrl_info.in_dst_ip & mask) == (dst_ip & mask)) { refcount_inc(&entry->use); read_unlock_bh(&client->ingress_lock); @@ -80,7 +80,7 @@ static in_cache_entry *in_cache_get_by_vcc(struct atm_vcc *vcc, @@ -763,7 +763,7 @@ index 23f36e5a20ee..c147fe916446 100644 entry = client->in_cache; - while (entry != NULL) { + while (entry) { - if (entry->shortcut = vcc) { + if (entry->shortcut == vcc) { refcount_inc(&entry->use); read_unlock_bh(&client->ingress_lock); @@ -108,7 +108,7 @@ static in_cache_entry *in_cache_add_entry(__be32 dst_ip, @@ -779,11 +779,11 @@ index 23f36e5a20ee..c147fe916446 100644 struct k_message msg; entry->count++; -- if (entry->entry_state = INGRESS_RESOLVED && entry->shortcut != NULL) -+ if (entry->entry_state = INGRESS_RESOLVED && entry->shortcut) +- if (entry->entry_state == INGRESS_RESOLVED && entry->shortcut != NULL) ++ if (entry->entry_state == INGRESS_RESOLVED && entry->shortcut) return OPEN; - if (entry->entry_state = INGRESS_REFRESHING) { + if (entry->entry_state == INGRESS_REFRESHING) { @@ -142,18 +142,18 @@ static int cache_hit(in_cache_entry *entry, struct mpoa_client *mpc) msg.content.in_info = entry->ctrl_info; memcpy(msg.MPS_ctrl, mpc->mps_ctrl_addr, ATM_ESA_LEN); @@ -801,8 +801,8 @@ index 23f36e5a20ee..c147fe916446 100644 return CLOSED; } -- if (entry->entry_state = INGRESS_RESOLVING && entry->shortcut != NULL) -+ if (entry->entry_state = INGRESS_RESOLVING && entry->shortcut) +- if (entry->entry_state == INGRESS_RESOLVING && entry->shortcut != NULL) ++ if (entry->entry_state == INGRESS_RESOLVING && entry->shortcut) return OPEN; if (entry->count > mpc->parameters.mpc_p1 && @@ -828,7 +828,7 @@ index 23f36e5a20ee..c147fe916446 100644 + if (entry->next) entry->next->prev = entry->prev; client->in_ops->put(entry); -- if (client->in_cache = NULL && client->eg_cache = NULL) { +- if (client->in_cache == NULL && client->eg_cache == NULL) { + if (!client->in_cache && !client->eg_cache) { msg.type = STOP_KEEP_ALIVE_SM; msg_to_mpoad(&msg, client); @@ -860,7 +860,7 @@ index 23f36e5a20ee..c147fe916446 100644 entry = client->in_cache; - while (entry != NULL) { + while (entry) { - if (entry->entry_state = INGRESS_RESOLVING) { + if (entry->entry_state == INGRESS_RESOLVING) { if ((now.tv_sec - entry->hold_down.tv_sec) < client->parameters.mpc_p6) { @@ -283,7 +284,7 @@ static void check_resolving_entries(struct mpoa_client *client) @@ -878,7 +878,7 @@ index 23f36e5a20ee..c147fe916446 100644 read_lock_bh(&client->ingress_lock); - while (entry != NULL) { + while (entry) { - if (entry->entry_state = INGRESS_RESOLVED) { + if (entry->entry_state == INGRESS_RESOLVED) { if (!(entry->refresh_time)) entry->refresh_time = (2 * (entry->ctrl_info.holding_time))/3; @@ -323,7 +324,7 @@ static void refresh_entries(struct mpoa_client *client) @@ -896,7 +896,7 @@ index 23f36e5a20ee..c147fe916446 100644 entry = mpc->eg_cache; - while (entry != NULL) { + while (entry) { - if (entry->ctrl_info.cache_id = cache_id) { + if (entry->ctrl_info.cache_id == cache_id) { refcount_inc(&entry->use); read_unlock_irq(&mpc->egress_lock); @@ -356,7 +357,7 @@ static eg_cache_entry *eg_cache_get_by_tag(__be32 tag, struct mpoa_client *mpc) @@ -905,7 +905,7 @@ index 23f36e5a20ee..c147fe916446 100644 entry = mpc->eg_cache; - while (entry != NULL) { + while (entry) { - if (entry->ctrl_info.tag = tag) { + if (entry->ctrl_info.tag == tag) { refcount_inc(&entry->use); read_unlock_irqrestore(&mpc->egress_lock, flags); @@ -378,7 +379,7 @@ static eg_cache_entry *eg_cache_get_by_vcc(struct atm_vcc *vcc, @@ -914,7 +914,7 @@ index 23f36e5a20ee..c147fe916446 100644 entry = mpc->eg_cache; - while (entry != NULL) { + while (entry) { - if (entry->shortcut = vcc) { + if (entry->shortcut == vcc) { refcount_inc(&entry->use); read_unlock_irqrestore(&mpc->egress_lock, flags); @@ -398,7 +399,7 @@ static eg_cache_entry *eg_cache_get_by_src_ip(__be32 ipaddr, @@ -923,7 +923,7 @@ index 23f36e5a20ee..c147fe916446 100644 entry = mpc->eg_cache; - while (entry != NULL) { + while (entry) { - if (entry->latest_ip_addr = ipaddr) { + if (entry->latest_ip_addr == ipaddr) { refcount_inc(&entry->use); read_unlock_irq(&mpc->egress_lock); @@ -430,22 +431,22 @@ static void eg_cache_remove_entry(eg_cache_entry *entry, @@ -939,7 +939,7 @@ index 23f36e5a20ee..c147fe916446 100644 + if (entry->next) entry->next->prev = entry->prev; client->eg_ops->put(entry); -- if (client->in_cache = NULL && client->eg_cache = NULL) { +- if (client->in_cache == NULL && client->eg_cache == NULL) { + if (!client->in_cache && !client->eg_cache) { msg.type = STOP_KEEP_ALIVE_SM; msg_to_mpoad(&msg, client); @@ -989,7 +989,7 @@ index 21d9d341a619..890eb377e2dd 100644 { struct pppoatm_vcc *pvcc = atmvcc_to_pvcc(atmvcc); pr_debug("\n"); -- if (skb = NULL) { /* VCC was closed */ +- if (skb == NULL) { /* VCC was closed */ + if (!skb) { /* VCC was closed */ struct module *module; @@ -998,7 +998,7 @@ index 21d9d341a619..890eb377e2dd 100644 skb_pull(skb, LLC_LEN); break; case e_autodetect: -- if (pvcc->chan.ppp = NULL) { /* Not bound yet! */ +- if (pvcc->chan.ppp == NULL) { /* Not bound yet! */ + if (!pvcc->chan.ppp) { /* Not bound yet! */ kfree_skb(skb); return; @@ -1015,7 +1015,7 @@ index 21d9d341a619..890eb377e2dd 100644 } consume_skb(skb); skb = n; -- if (skb = NULL) { +- if (skb == NULL) { + if (!skb) { bh_unlock_sock(sk_atm(vcc)); return DROP_PACKET; @@ -1024,7 +1024,7 @@ index 21d9d341a619..890eb377e2dd 100644 be.encaps != PPPOATM_ENCAPS_VC && be.encaps != PPPOATM_ENCAPS_LLC) return -EINVAL; pvcc = kzalloc(sizeof(*pvcc), GFP_KERNEL); -- if (pvcc = NULL) +- if (pvcc == NULL) + if (!pvcc) return -ENOMEM; pvcc->atmvcc = atmvcc; @@ -1037,7 +1037,7 @@ index 4caca2a90ec4..aa230079cf8a 100644 struct vcc_state *state; state = __seq_open_private(file, ops, sizeof(*state)); -- if (state = NULL) +- if (state == NULL) + if (!state) return -ENOMEM; diff --git a/a/content_digest b/N1/content_digest index a44311f..a05a5ce 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\010a92558-1105-b947-86a2-6ac763cca36d@users.sourceforge.net\0" "From\0SF Markus Elfring <elfring@users.sourceforge.net>\0" "Subject\0[PATCH 3/3] net/atm: Adjust 121 checks for null pointers\0" - "Date\0Mon, 09 Oct 2017 20:52:22 +0000\0" + "Date\0Mon, 9 Oct 2017 22:52:22 +0200\0" "To\0netdev@vger.kernel.org" Alexey Dobriyan <adobriyan@gmail.com> Andrew Morton <akpm@linux-foundation.org> @@ -51,7 +51,7 @@ " \t\tstruct sk_buff *skb2 = skb_realloc_headroom(skb, minheadroom);\n" " \t\tbrvcc->copies_needed++;\n" " \t\tdev_kfree_skb(skb);\n" - "-\t\tif (skb2 = NULL) {\n" + "-\t\tif (skb2 == NULL) {\n" "+\t\tif (!skb2) {\n" " \t\t\tbrvcc->copies_failed++;\n" " \t\t\treturn 0;\n" @@ -60,7 +60,7 @@ " \tpr_debug(\"skb_dst(skb)=%p\\n\", skb_dst(skb));\n" " \tread_lock(&devs_lock);\n" " \tbrvcc = pick_outgoing_vcc(skb, brdev);\n" - "-\tif (brvcc = NULL) {\n" + "-\tif (brvcc == NULL) {\n" "+\tif (!brvcc) {\n" " \t\tpr_debug(\"no vcc attached to dev %s\\n\", dev->name);\n" " \t\tdev->stats.tx_errors++;\n" @@ -69,14 +69,14 @@ " \t\tstruct br2684_dev *brdev;\n" " \t\tread_lock(&devs_lock);\n" " \t\tbrdev = BRPRIV(br2684_find_dev(&fs.ifspec));\n" - "-\t\tif (brdev = NULL || list_empty(&brdev->brvccs) ||\n" + "-\t\tif (brdev == NULL || list_empty(&brdev->brvccs) ||\n" "+\t\tif (!brdev || list_empty(&brdev->brvccs) ||\n" " \t\t brdev->brvccs.next != brdev->brvccs.prev)\t/* >1 VCC */\n" " \t\t\tbrvcc = NULL;\n" " \t\telse\n" " \t\t\tbrvcc = list_entry_brvcc(brdev->brvccs.next);\n" " \t\tread_unlock(&devs_lock);\n" - "-\t\tif (brvcc = NULL)\n" + "-\t\tif (brvcc == NULL)\n" "+\t\tif (!brvcc)\n" " \t\t\treturn -ESRCH;\n" " \t} else\n" @@ -86,23 +86,23 @@ " \n" " \tpr_debug(\"\\n\");\n" "-\n" - "-\tif (unlikely(skb = NULL)) {\n" + "-\tif (unlikely(skb == NULL)) {\n" "+\tif (unlikely(!skb)) {\n" - " \t\t/* skb=NULL means VCC is being destroyed */\n" + " \t\t/* skb==NULL means VCC is being destroyed */\n" " \t\tbr2684_close_vcc(brvcc);\n" " \t\tif (list_empty(&brdev->brvccs)) {\n" "@@ -550,13 +549,13 @@ static int br2684_regvcc(struct atm_vcc *atmvcc, void __user * arg)\n" " \tatomic_set(&brvcc->qspace, 2);\n" " \twrite_lock_irq(&devs_lock);\n" " \tnet_dev = br2684_find_dev(&be.ifspec);\n" - "-\tif (net_dev = NULL) {\n" + "-\tif (net_dev == NULL) {\n" "+\tif (!net_dev) {\n" " \t\tpr_err(\"tried to attach to non-existent device\\n\");\n" " \t\terr = -ENXIO;\n" " \t\tgoto error;\n" " \t}\n" " \tbrdev = BRPRIV(net_dev);\n" - "-\tif (atmvcc->push = NULL) {\n" + "-\tif (atmvcc->push == NULL) {\n" "+\tif (!atmvcc->push) {\n" " \t\terr = -EBADFD;\n" " \t\tgoto error;\n" @@ -111,7 +111,7 @@ " #ifdef CONFIG_PROC_FS\n" " \tstruct proc_dir_entry *p;\n" " \tp = proc_create(\"br2684\", 0, atm_proc_root, &br2684_proc_ops);\n" - "-\tif (p = NULL)\n" + "-\tif (p == NULL)\n" "+\tif (!p)\n" " \t\treturn -ENOMEM;\n" " #endif\n" @@ -137,7 +137,7 @@ " \t\tstruct atmlec_msg *mesg;\n" " \n" " \t\tskb2 = alloc_skb(sizeof(struct atmlec_msg), GFP_ATOMIC);\n" - "-\t\tif (skb2 = NULL)\n" + "-\t\tif (skb2 == NULL)\n" "+\t\tif (!skb2)\n" " \t\t\treturn;\n" " \t\tskb2->len = sizeof(struct atmlec_msg);\n" @@ -146,7 +146,7 @@ " \t\t\t\t\t min_frame_size - skb->truesize,\n" " \t\t\t\t\t GFP_ATOMIC);\n" " \t\t\tdev_kfree_skb(skb);\n" - "-\t\t\tif (skb2 = NULL) {\n" + "-\t\t\tif (skb2 == NULL) {\n" "+\t\t\tif (!skb2) {\n" " \t\t\t\tdev->stats.tx_dropped++;\n" " \t\t\t\treturn NETDEV_TX_OK;\n" @@ -155,7 +155,7 @@ " \t\tpr_debug(\"%s: bridge zeppelin asks about %pM\\n\",\n" " \t\t\t dev->name, mesg->content.proxy.mac_addr);\n" " \n" - "-\t\tif (br_fdb_test_addr_hook = NULL)\n" + "-\t\tif (br_fdb_test_addr_hook == NULL)\n" "+\t\tif (!br_fdb_test_addr_hook)\n" " \t\t\tbreak;\n" " \n" @@ -164,7 +164,7 @@ " \t\t\tpr_debug(\"%s: entry found, responding to zeppelin\\n\",\n" " \t\t\t\t dev->name);\n" " \t\t\tskb2 = alloc_skb(sizeof(struct atmlec_msg), GFP_ATOMIC);\n" - "-\t\t\tif (skb2 = NULL)\n" + "-\t\t\tif (skb2 == NULL)\n" "+\t\t\tif (!skb2)\n" " \t\t\t\tbreak;\n" " \t\t\tskb2->len = sizeof(struct atmlec_msg);\n" @@ -191,7 +191,7 @@ " \tstruct lec_vcc_priv *vpriv = LEC_VCC_PRIV(vcc);\n" " \tstruct net_device *dev = skb->dev;\n" " \n" - "-\tif (vpriv = NULL) {\n" + "-\tif (vpriv == NULL) {\n" "+\tif (!vpriv) {\n" " \t\tpr_info(\"vpriv = NULL!?!?!?\\n\");\n" " \t\treturn;\n" @@ -209,12 +209,12 @@ " \t\tspin_lock_irqsave(&priv->lec_arp_lock, flags);\n" " \t\ttable = lec_arp_find(priv, dst_mac);\n" " \t\tspin_unlock_irqrestore(&priv->lec_arp_lock, flags);\n" - "-\t\tif (table = NULL)\n" + "-\t\tif (table == NULL)\n" "+\t\tif (!table)\n" " \t\t\treturn -1;\n" " \n" " \t\t*tlvs = kmemdup(table->tlvs, table->sizeoftlvs, GFP_ATOMIC);\n" - "-\t\tif (*tlvs = NULL)\n" + "-\t\tif (*tlvs == NULL)\n" "+\t\tif (!*tlvs)\n" " \t\t\treturn -1;\n" " \n" @@ -223,13 +223,13 @@ " \t\treturn 0;\n" " \t}\n" " \n" - "-\tif (sizeoftlvs = NULL)\n" + "-\tif (sizeoftlvs == NULL)\n" "+\tif (!sizeoftlvs)\n" " \t\tretval = send_to_lecd(priv, l_arp_xmt, dst_mac, NULL, NULL);\n" " \n" " \telse {\n" " \t\tskb = alloc_skb(*sizeoftlvs, GFP_ATOMIC);\n" - "-\t\tif (skb = NULL)\n" + "-\t\tif (skb == NULL)\n" "+\t\tif (!skb)\n" " \t\t\treturn -1;\n" " \t\tskb->len = *sizeoftlvs;\n" @@ -238,13 +238,13 @@ " \tkfree(priv->tlvs);\t/* NULL if there was no previous association */\n" " \n" " \tpriv->tlvs = kmemdup(tlvs, sizeoftlvs, GFP_KERNEL);\n" - "-\tif (priv->tlvs = NULL)\n" + "-\tif (priv->tlvs == NULL)\n" "+\tif (!priv->tlvs)\n" " \t\treturn 0;\n" " \tpriv->sizeoftlvs = sizeoftlvs;\n" " \n" " \tskb = alloc_skb(sizeoftlvs, GFP_ATOMIC);\n" - "-\tif (skb = NULL)\n" + "-\tif (skb == NULL)\n" "+\tif (!skb)\n" " \t\treturn 0;\n" " \tskb->len = sizeoftlvs;\n" @@ -253,14 +253,14 @@ " \t\t\t\t */\n" " \tstruct lec_arp_table *entry = lec_arp_find(priv, mac_addr);\n" " \n" - "-\tif (entry = NULL)\n" + "-\tif (entry == NULL)\n" "+\tif (!entry)\n" " \t\treturn;\t\t/* should not happen */\n" " \n" " \tkfree(entry->tlvs);\n" " \n" " \tentry->tlvs = kmemdup(tlvs, sizeoftlvs, GFP_KERNEL);\n" - "-\tif (entry->tlvs = NULL)\n" + "-\tif (entry->tlvs == NULL)\n" "+\tif (!entry->tlvs)\n" " \t\treturn;\n" " \tentry->sizeoftlvs = sizeoftlvs;\n" @@ -269,7 +269,7 @@ " \n" " \tspin_lock_irqsave(&priv->lec_arp_lock, flags);\n" " \tentry = lec_arp_find(priv, mac_addr);\n" - "-\tif (entry = NULL && targetless_le_arp)\n" + "-\tif (entry == NULL && targetless_le_arp)\n" "+\tif (!entry && targetless_le_arp)\n" " \t\tgoto out;\t/*\n" " \t\t\t\t * LANE2: ignore targetless LE_ARPs for which\n" @@ -278,7 +278,7 @@ " \t\tentry->old_recv_push = old_push;\n" " #endif\n" " \t\tentry = make_entry(priv, bus_mac);\n" - "-\t\tif (entry = NULL)\n" + "-\t\tif (entry == NULL)\n" "+\t\tif (!entry)\n" " \t\t\tgoto out;\n" " \t\tdel_timer(&entry->timer);\n" @@ -287,7 +287,7 @@ " \t\t\t ioc_data->atm_addr[16], ioc_data->atm_addr[17],\n" " \t\t\t ioc_data->atm_addr[18], ioc_data->atm_addr[19]);\n" " \t\tentry = make_entry(priv, bus_mac);\n" - "-\t\tif (entry = NULL)\n" + "-\t\tif (entry == NULL)\n" "+\t\tif (!entry)\n" " \t\t\tgoto out;\n" " \t\tmemcpy(entry->atm_addr, ioc_data->atm_addr, ATM_ESA_LEN);\n" @@ -302,7 +302,7 @@ " \tmpc = mpcs; /* our global linked list */\n" "-\twhile (mpc != NULL) {\n" "+\twhile (mpc) {\n" - " \t\tif (mpc->dev_num = itf)\n" + " \t\tif (mpc->dev_num == itf)\n" " \t\t\treturn mpc;\n" " \t\tmpc = mpc->next;\n" "@@ -143,7 +143,7 @@ static struct mpoa_client *find_mpc_by_vcc(struct atm_vcc *vcc)\n" @@ -311,7 +311,7 @@ " \tmpc = mpcs; /* our global linked list */\n" "-\twhile (mpc != NULL) {\n" "+\twhile (mpc) {\n" - " \t\tif (mpc->mpoad_vcc = vcc)\n" + " \t\tif (mpc->mpoad_vcc == vcc)\n" " \t\t\treturn mpc;\n" " \t\tmpc = mpc->next;\n" "@@ -157,7 +157,7 @@ static struct mpoa_client *find_mpc_by_lec(struct net_device *dev)\n" @@ -320,7 +320,7 @@ " \tmpc = mpcs; /* our global linked list */\n" "-\twhile (mpc != NULL) {\n" "+\twhile (mpc) {\n" - " \t\tif (mpc->dev = dev)\n" + " \t\tif (mpc->dev == dev)\n" " \t\t\treturn mpc;\n" " \t\tmpc = mpc->next;\n" "@@ -178,7 +178,7 @@ struct atm_mpoa_qos *atm_mpoa_add_qos(__be32 dst_ip, struct atm_qos *qos)\n" @@ -336,10 +336,10 @@ " {\n" " \tstruct atm_mpoa_qos *curr;\n" " \n" - "-\tif (entry = NULL)\n" + "-\tif (entry == NULL)\n" "+\tif (!entry)\n" " \t\treturn 0;\n" - " \tif (entry = qos_head) {\n" + " \tif (entry == qos_head) {\n" " \t\tqos_head = qos_head->next;\n" "@@ -226,7 +226,7 @@ int atm_mpoa_delete_qos(struct atm_mpoa_qos *entry)\n" " \t}\n" @@ -347,7 +347,7 @@ " \tcurr = qos_head;\n" "-\twhile (curr != NULL) {\n" "+\twhile (curr) {\n" - " \t\tif (curr->next = entry) {\n" + " \t\tif (curr->next == entry) {\n" " \t\t\tcurr->next = entry->next;\n" " \t\t\tkfree(entry);\n" "@@ -247,7 +247,7 @@ void atm_mpoa_disp_qos(struct seq_file *m)\n" @@ -363,7 +363,7 @@ " \tstruct mpoa_client *mpc;\n" " \n" " \tmpc = kzalloc(sizeof(*mpc), GFP_KERNEL);\n" - "-\tif (mpc = NULL)\n" + "-\tif (mpc == NULL)\n" "+\tif (!mpc)\n" " \t\treturn NULL;\n" " \trwlock_init(&mpc->ingress_lock);\n" @@ -372,7 +372,7 @@ " \tdprintk(\"(%s) received TLV(s), \", dev->name);\n" " \tdprintk(\"total length of all TLVs %d\\n\", sizeoftlvs);\n" " \tmpc = find_mpc_by_lec(dev); /* Sampo-Fix: moved here from below */\n" - "-\tif (mpc = NULL) {\n" + "-\tif (mpc == NULL) {\n" "+\tif (!mpc) {\n" " \t\tpr_info(\"(%s) no mpc\\n\", dev->name);\n" " \t\treturn;\n" @@ -381,7 +381,7 @@ " \n" " \t\ttlvs = copy_macs(mpc, mac_addr, tlvs,\n" " \t\t\t\t number_of_mps_macs, mpoa_device_type);\n" - "-\t\tif (tlvs = NULL)\n" + "-\t\tif (tlvs == NULL)\n" "+\t\tif (!tlvs)\n" " \t\t\treturn;\n" " \t}\n" @@ -390,7 +390,7 @@ " \t\t mpc->dev->name, ipaddr);\n" " \n" " \tentry = mpc->in_ops->get(ipaddr, mpc);\n" - "-\tif (entry = NULL) {\n" + "-\tif (entry == NULL) {\n" "+\tif (!entry) {\n" " \t\tentry = mpc->in_ops->add_entry(ipaddr, mpc);\n" "-\t\tif (entry != NULL)\n" @@ -402,7 +402,7 @@ " \tint i = 0;\n" " \n" " \tmpc = find_mpc_by_lec(dev); /* this should NEVER fail */\n" - "-\tif (mpc = NULL) {\n" + "-\tif (mpc == NULL) {\n" "+\tif (!mpc) {\n" " \t\tpr_info(\"(%s) no MPC found\\n\", dev->name);\n" " \t\tgoto non_ip;\n" @@ -411,13 +411,13 @@ " \t\treturn -EINVAL;\n" " \n" " \tmpc = find_mpc_by_itfnum(ioc_data.dev_num);\n" - "-\tif (mpc = NULL)\n" + "-\tif (mpc == NULL)\n" "+\tif (!mpc)\n" " \t\treturn -EINVAL;\n" " \n" - " \tif (ioc_data.type = MPC_SOCKET_INGRESS) {\n" + " \tif (ioc_data.type == MPC_SOCKET_INGRESS) {\n" " \t\tin_entry = mpc->in_ops->get(ipaddr, mpc);\n" - "-\t\tif (in_entry = NULL ||\n" + "-\t\tif (in_entry == NULL ||\n" "+\t\tif (!in_entry ||\n" " \t\t in_entry->entry_state < INGRESS_RESOLVED) {\n" " \t\t\tpr_info(\"(%s) did not find RESOLVED entry from ingress cache\\n\",\n" @@ -431,7 +431,7 @@ " \teg_cache_entry *eg_entry;\n" " \n" " \tmpc = find_mpc_by_lec(dev);\n" - "-\tif (mpc = NULL) {\n" + "-\tif (mpc == NULL) {\n" "+\tif (!mpc) {\n" " \t\tpr_info(\"(%s) close for unknown MPC\\n\", dev->name);\n" " \t\treturn;\n" @@ -440,7 +440,7 @@ " \t\tmpc->eg_ops->put(eg_entry);\n" " \t}\n" " \n" - "-\tif (in_entry = NULL && eg_entry = NULL)\n" + "-\tif (in_entry == NULL && eg_entry == NULL)\n" "+\tif (!in_entry && !eg_entry)\n" " \t\tdprintk(\"(%s) unused vcc closed\\n\", dev->name);\n" " }\n" @@ -449,7 +449,7 @@ " \tchar *tmp;\n" " \n" " \tddprintk(\"(%s)\\n\", dev->name);\n" - "-\tif (skb = NULL) {\n" + "-\tif (skb == NULL) {\n" "+\tif (!skb) {\n" " \t\tdprintk(\"(%s) null skb, closing VCC\\n\", dev->name);\n" " \t\tmpc_vcc_close(vcc, dev);\n" @@ -458,7 +458,7 @@ " \tatm_return(vcc, skb->truesize);\n" " \n" " \tmpc = find_mpc_by_lec(dev);\n" - "-\tif (mpc = NULL) {\n" + "-\tif (mpc == NULL) {\n" "+\tif (!mpc) {\n" " \t\tpr_info(\"(%s) unknown MPC\\n\", dev->name);\n" " \t\treturn;\n" @@ -467,7 +467,7 @@ " \ttag = *(__be32 *)tmp;\n" " \n" " \teg = mpc->eg_ops->get_by_tag(tag, mpc);\n" - "-\tif (eg = NULL) {\n" + "-\tif (eg == NULL) {\n" "+\tif (!eg) {\n" " \t\tpr_info(\"mpoa: (%s) Didn't find egress cache entry, tag = %u\\n\",\n" " \t\t\tdev->name, tag);\n" @@ -476,7 +476,7 @@ " \t * See if ingress MPC is using shortcut we opened as a return channel.\n" " \t * This means we have a bi-directional vcc opened by us.\n" " \t */\n" - "-\tif (eg->shortcut = NULL) {\n" + "-\tif (eg->shortcut == NULL) {\n" "+\tif (!eg->shortcut) {\n" " \t\teg->shortcut = vcc;\n" " \t\tpr_info(\"(%s) egress SVC in use\\n\", dev->name);\n" @@ -485,7 +485,7 @@ " \tnew_skb = skb_realloc_headroom(skb, eg->ctrl_info.DH_length);\n" " \t\t\t\t\t/* LLC/SNAP is shorter than MAC header :( */\n" " \tdev_kfree_skb_any(skb);\n" - "-\tif (new_skb = NULL) {\n" + "-\tif (new_skb == NULL) {\n" "+\tif (!new_skb) {\n" " \t\tmpc->eg_ops->put(eg);\n" " \t\treturn;\n" @@ -494,7 +494,7 @@ " \tstruct lec_priv *priv;\n" " \tint err;\n" " \n" - "-\tif (mpcs = NULL) {\n" + "-\tif (mpcs == NULL) {\n" "+\tif (!mpcs) {\n" " \t\tinit_timer(&mpc_timer);\n" " \t\tmpc_timer_refresh();\n" @@ -503,11 +503,11 @@ " \t}\n" " \n" " \tmpc = find_mpc_by_itfnum(arg);\n" - "-\tif (mpc = NULL) {\n" + "-\tif (mpc == NULL) {\n" "+\tif (!mpc) {\n" " \t\tdprintk(\"allocating new mpc for itf %d\\n\", arg);\n" " \t\tmpc = alloc_mpc();\n" - "-\t\tif (mpc = NULL)\n" + "-\t\tif (mpc == NULL)\n" "+\t\tif (!mpc)\n" " \t\t\treturn -ENOMEM;\n" " \t\tmpc->dev_num = arg;\n" @@ -516,7 +516,7 @@ " \tstruct sk_buff *skb;\n" " \n" " \tmpc = find_mpc_by_vcc(vcc);\n" - "-\tif (mpc = NULL) {\n" + "-\tif (mpc == NULL) {\n" "+\tif (!mpc) {\n" " \t\tpr_info(\"did not find MPC\\n\");\n" " \t\treturn;\n" @@ -525,7 +525,7 @@ " \tstruct k_message *mesg = (struct k_message *)skb->data;\n" " \tWARN_ON(refcount_sub_and_test(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc));\n" " \n" - "-\tif (mpc = NULL) {\n" + "-\tif (mpc == NULL) {\n" "+\tif (!mpc) {\n" " \t\tpr_info(\"no mpc found\\n\");\n" " \t\treturn 0;\n" @@ -534,14 +534,14 @@ " \tstruct sk_buff *skb;\n" " \tstruct sock *sk;\n" " \n" - "-\tif (mpc = NULL || !mpc->mpoad_vcc) {\n" + "-\tif (mpc == NULL || !mpc->mpoad_vcc) {\n" "+\tif (!mpc || !mpc->mpoad_vcc) {\n" " \t\tpr_info(\"mesg %d to a non-existent mpoad\\n\", mesg->type);\n" " \t\treturn -ENXIO;\n" " \t}\n" " \n" " \tskb = alloc_skb(sizeof(struct k_message), GFP_ATOMIC);\n" - "-\tif (skb = NULL)\n" + "-\tif (skb == NULL)\n" "+\tif (!skb)\n" " \t\treturn -ENOMEM;\n" " \tskb_put(skb, sizeof(struct k_message));\n" @@ -550,11 +550,11 @@ " \t\t\tbreak;\n" " \t\tpriv->lane2_ops->associate_indicator = lane2_assoc_ind;\n" " \t\tmpc = find_mpc_by_itfnum(priv->itfnum);\n" - "-\t\tif (mpc = NULL) {\n" + "-\t\tif (mpc == NULL) {\n" "+\t\tif (!mpc) {\n" " \t\t\tdprintk(\"allocating new mpc for %s\\n\", dev->name);\n" " \t\t\tmpc = alloc_mpc();\n" - "-\t\t\tif (mpc = NULL) {\n" + "-\t\t\tif (mpc == NULL) {\n" "+\t\t\tif (!mpc) {\n" " \t\t\t\tpr_info(\"no new mpc\");\n" " \t\t\t\tbreak;\n" @@ -563,7 +563,7 @@ " \tcase NETDEV_UNREGISTER:\n" " \t\t/* the lec device was deallocated */\n" " \t\tmpc = find_mpc_by_lec(dev);\n" - "-\t\tif (mpc = NULL)\n" + "-\t\tif (mpc == NULL)\n" "+\t\tif (!mpc)\n" " \t\t\tbreak;\n" " \t\tdprintk(\"device (%s) was deallocated\\n\", dev->name);\n" @@ -572,7 +572,7 @@ " \tcase NETDEV_UP:\n" " \t\t/* the dev was ifconfig'ed up */\n" " \t\tmpc = find_mpc_by_lec(dev);\n" - "-\t\tif (mpc = NULL)\n" + "-\t\tif (mpc == NULL)\n" "+\t\tif (!mpc)\n" " \t\t\tbreak;\n" "-\t\tif (mpc->mpoad_vcc != NULL)\n" @@ -584,7 +584,7 @@ " \t\t * upper layer stops\n" " \t\t */\n" " \t\tmpc = find_mpc_by_lec(dev);\n" - "-\t\tif (mpc = NULL)\n" + "-\t\tif (mpc == NULL)\n" "+\t\tif (!mpc)\n" " \t\t\tbreak;\n" "-\t\tif (mpc->mpoad_vcc != NULL)\n" @@ -596,7 +596,7 @@ " \tin_cache_entry *entry;\n" " \n" " \tentry = mpc->in_ops->get(dst_ip, mpc);\n" - "-\tif (entry = NULL) {\n" + "-\tif (entry == NULL) {\n" "+\tif (!entry) {\n" " \t\tentry = mpc->in_ops->add_entry(dst_ip, mpc);\n" " \t\tentry->entry_state = INGRESS_RESOLVING;\n" @@ -614,7 +614,7 @@ " \t\tmpc->dev->name, &dst_ip);\n" " \tddprintk(\"(%s) entry = %p\",\n" " \t\t mpc->dev->name, entry);\n" - "-\tif (entry = NULL) {\n" + "-\tif (entry == NULL) {\n" "+\tif (!entry) {\n" " \t\tpr_info(\"(%s) ARGH, received res. reply for an entry that doesn't exist.\\n\",\n" " \t\t\tmpc->dev->name);\n" @@ -622,7 +622,7 @@ "@@ -1178,13 +1178,13 @@ static void MPOA_res_reply_rcvd(struct k_message *msg, struct mpoa_client *mpc)\n" " \tddprintk_cont(\"entry->shortcut = %p\\n\", entry->shortcut);\n" " \n" - " \tif (entry->entry_state = INGRESS_RESOLVING &&\n" + " \tif (entry->entry_state == INGRESS_RESOLVING &&\n" "-\t entry->shortcut != NULL) {\n" "+\t entry->shortcut) {\n" " \t\tentry->entry_state = INGRESS_RESOLVED;\n" @@ -639,7 +639,7 @@ " \t__be32 mask = msg->ip_mask;\n" " \tin_cache_entry *entry = mpc->in_ops->get_with_mask(dst_ip, mpc, mask);\n" " \n" - "-\tif (entry = NULL) {\n" + "-\tif (entry == NULL) {\n" "+\tif (!entry) {\n" " \t\tpr_info(\"(%s) purge for a non-existing entry, ip = %pI4\\n\",\n" " \t\t\tmpc->dev->name, &dst_ip);\n" @@ -657,7 +657,7 @@ " \t__be32 cache_id = msg->content.eg_info.cache_id;\n" " \teg_cache_entry *entry = mpc->eg_ops->get_by_cache_id(cache_id, mpc);\n" " \n" - "-\tif (entry = NULL) {\n" + "-\tif (entry == NULL) {\n" "+\tif (!entry) {\n" " \t\tdprintk(\"(%s) purge for a non-existing entry\\n\",\n" " \t\t\tmpc->dev->name);\n" @@ -666,14 +666,14 @@ " \tstruct sk_buff *skb;\n" " \n" " \tdprintk(\"entering\\n\");\n" - "-\tif (vcc = NULL) {\n" + "-\tif (vcc == NULL) {\n" "+\tif (!vcc) {\n" - " \t\tpr_info(\"vcc = NULL\\n\");\n" + " \t\tpr_info(\"vcc == NULL\\n\");\n" " \t\treturn;\n" " \t}\n" " \n" " \tskb = alloc_skb(sizeof(struct k_message), GFP_ATOMIC);\n" - "-\tif (skb = NULL) {\n" + "-\tif (skb == NULL) {\n" "+\tif (!skb) {\n" " \t\tpr_info(\"out of memory\\n\");\n" " \t\treturn;\n" @@ -700,7 +700,7 @@ " \tholding_time = msg->content.eg_info.holding_time;\n" " \tdprintk(\"(%s) entry = %p, holding_time = %u\\n\",\n" " \t\tmpc->dev->name, entry, holding_time);\n" - "-\tif (entry = NULL && holding_time) {\n" + "-\tif (entry == NULL && holding_time) {\n" "+\tif (!entry && holding_time) {\n" " \t\tentry = mpc->eg_ops->add_entry(msg, mpc);\n" " \t\tmpc->eg_ops->put(entry);\n" @@ -709,7 +709,7 @@ " \t\tkfree(client->mps_macs);\n" " \tclient->number_of_mps_macs = 0;\n" " \tclient->mps_macs = kmemdup(msg->MPS_ctrl, ETH_ALEN, GFP_KERNEL);\n" - "-\tif (client->mps_macs = NULL) {\n" + "-\tif (client->mps_macs == NULL) {\n" "+\tif (!client->mps_macs) {\n" " \t\tpr_info(\"out of memory\\n\");\n" " \t\treturn;\n" @@ -767,7 +767,7 @@ " \tentry = client->in_cache;\n" "-\twhile (entry != NULL) {\n" "+\twhile (entry) {\n" - " \t\tif (entry->ctrl_info.in_dst_ip = dst_ip) {\n" + " \t\tif (entry->ctrl_info.in_dst_ip == dst_ip) {\n" " \t\t\trefcount_inc(&entry->use);\n" " \t\t\tread_unlock_bh(&client->ingress_lock);\n" "@@ -59,7 +59,7 @@ static in_cache_entry *in_cache_get_with_mask(__be32 dst_ip,\n" @@ -776,7 +776,7 @@ " \tentry = client->in_cache;\n" "-\twhile (entry != NULL) {\n" "+\twhile (entry) {\n" - " \t\tif ((entry->ctrl_info.in_dst_ip & mask) = (dst_ip & mask)) {\n" + " \t\tif ((entry->ctrl_info.in_dst_ip & mask) == (dst_ip & mask)) {\n" " \t\t\trefcount_inc(&entry->use);\n" " \t\t\tread_unlock_bh(&client->ingress_lock);\n" "@@ -80,7 +80,7 @@ static in_cache_entry *in_cache_get_by_vcc(struct atm_vcc *vcc,\n" @@ -785,7 +785,7 @@ " \tentry = client->in_cache;\n" "-\twhile (entry != NULL) {\n" "+\twhile (entry) {\n" - " \t\tif (entry->shortcut = vcc) {\n" + " \t\tif (entry->shortcut == vcc) {\n" " \t\t\trefcount_inc(&entry->use);\n" " \t\t\tread_unlock_bh(&client->ingress_lock);\n" "@@ -108,7 +108,7 @@ static in_cache_entry *in_cache_add_entry(__be32 dst_ip,\n" @@ -801,11 +801,11 @@ " \tstruct k_message msg;\n" " \n" " \tentry->count++;\n" - "-\tif (entry->entry_state = INGRESS_RESOLVED && entry->shortcut != NULL)\n" - "+\tif (entry->entry_state = INGRESS_RESOLVED && entry->shortcut)\n" + "-\tif (entry->entry_state == INGRESS_RESOLVED && entry->shortcut != NULL)\n" + "+\tif (entry->entry_state == INGRESS_RESOLVED && entry->shortcut)\n" " \t\treturn OPEN;\n" " \n" - " \tif (entry->entry_state = INGRESS_REFRESHING) {\n" + " \tif (entry->entry_state == INGRESS_REFRESHING) {\n" "@@ -142,18 +142,18 @@ static int cache_hit(in_cache_entry *entry, struct mpoa_client *mpc)\n" " \t\t\tmsg.content.in_info = entry->ctrl_info;\n" " \t\t\tmemcpy(msg.MPS_ctrl, mpc->mps_ctrl_addr, ATM_ESA_LEN);\n" @@ -823,8 +823,8 @@ " \t\treturn CLOSED;\n" " \t}\n" " \n" - "-\tif (entry->entry_state = INGRESS_RESOLVING && entry->shortcut != NULL)\n" - "+\tif (entry->entry_state = INGRESS_RESOLVING && entry->shortcut)\n" + "-\tif (entry->entry_state == INGRESS_RESOLVING && entry->shortcut != NULL)\n" + "+\tif (entry->entry_state == INGRESS_RESOLVING && entry->shortcut)\n" " \t\treturn OPEN;\n" " \n" " \tif (entry->count > mpc->parameters.mpc_p1 &&\n" @@ -850,7 +850,7 @@ "+\tif (entry->next)\n" " \t\tentry->next->prev = entry->prev;\n" " \tclient->in_ops->put(entry);\n" - "-\tif (client->in_cache = NULL && client->eg_cache = NULL) {\n" + "-\tif (client->in_cache == NULL && client->eg_cache == NULL) {\n" "+\tif (!client->in_cache && !client->eg_cache) {\n" " \t\tmsg.type = STOP_KEEP_ALIVE_SM;\n" " \t\tmsg_to_mpoad(&msg, client);\n" @@ -882,7 +882,7 @@ " \tentry = client->in_cache;\n" "-\twhile (entry != NULL) {\n" "+\twhile (entry) {\n" - " \t\tif (entry->entry_state = INGRESS_RESOLVING) {\n" + " \t\tif (entry->entry_state == INGRESS_RESOLVING) {\n" " \t\t\tif ((now.tv_sec - entry->hold_down.tv_sec) <\n" " \t\t\t client->parameters.mpc_p6) {\n" "@@ -283,7 +284,7 @@ static void check_resolving_entries(struct mpoa_client *client)\n" @@ -900,7 +900,7 @@ " \tread_lock_bh(&client->ingress_lock);\n" "-\twhile (entry != NULL) {\n" "+\twhile (entry) {\n" - " \t\tif (entry->entry_state = INGRESS_RESOLVED) {\n" + " \t\tif (entry->entry_state == INGRESS_RESOLVED) {\n" " \t\t\tif (!(entry->refresh_time))\n" " \t\t\t\tentry->refresh_time = (2 * (entry->ctrl_info.holding_time))/3;\n" "@@ -323,7 +324,7 @@ static void refresh_entries(struct mpoa_client *client)\n" @@ -918,7 +918,7 @@ " \tentry = mpc->eg_cache;\n" "-\twhile (entry != NULL) {\n" "+\twhile (entry) {\n" - " \t\tif (entry->ctrl_info.cache_id = cache_id) {\n" + " \t\tif (entry->ctrl_info.cache_id == cache_id) {\n" " \t\t\trefcount_inc(&entry->use);\n" " \t\t\tread_unlock_irq(&mpc->egress_lock);\n" "@@ -356,7 +357,7 @@ static eg_cache_entry *eg_cache_get_by_tag(__be32 tag, struct mpoa_client *mpc)\n" @@ -927,7 +927,7 @@ " \tentry = mpc->eg_cache;\n" "-\twhile (entry != NULL) {\n" "+\twhile (entry) {\n" - " \t\tif (entry->ctrl_info.tag = tag) {\n" + " \t\tif (entry->ctrl_info.tag == tag) {\n" " \t\t\trefcount_inc(&entry->use);\n" " \t\t\tread_unlock_irqrestore(&mpc->egress_lock, flags);\n" "@@ -378,7 +379,7 @@ static eg_cache_entry *eg_cache_get_by_vcc(struct atm_vcc *vcc,\n" @@ -936,7 +936,7 @@ " \tentry = mpc->eg_cache;\n" "-\twhile (entry != NULL) {\n" "+\twhile (entry) {\n" - " \t\tif (entry->shortcut = vcc) {\n" + " \t\tif (entry->shortcut == vcc) {\n" " \t\t\trefcount_inc(&entry->use);\n" " \t\t\tread_unlock_irqrestore(&mpc->egress_lock, flags);\n" "@@ -398,7 +399,7 @@ static eg_cache_entry *eg_cache_get_by_src_ip(__be32 ipaddr,\n" @@ -945,7 +945,7 @@ " \tentry = mpc->eg_cache;\n" "-\twhile (entry != NULL) {\n" "+\twhile (entry) {\n" - " \t\tif (entry->latest_ip_addr = ipaddr) {\n" + " \t\tif (entry->latest_ip_addr == ipaddr) {\n" " \t\t\trefcount_inc(&entry->use);\n" " \t\t\tread_unlock_irq(&mpc->egress_lock);\n" "@@ -430,22 +431,22 @@ static void eg_cache_remove_entry(eg_cache_entry *entry,\n" @@ -961,7 +961,7 @@ "+\tif (entry->next)\n" " \t\tentry->next->prev = entry->prev;\n" " \tclient->eg_ops->put(entry);\n" - "-\tif (client->in_cache = NULL && client->eg_cache = NULL) {\n" + "-\tif (client->in_cache == NULL && client->eg_cache == NULL) {\n" "+\tif (!client->in_cache && !client->eg_cache) {\n" " \t\tmsg.type = STOP_KEEP_ALIVE_SM;\n" " \t\tmsg_to_mpoad(&msg, client);\n" @@ -1011,7 +1011,7 @@ " {\n" " \tstruct pppoatm_vcc *pvcc = atmvcc_to_pvcc(atmvcc);\n" " \tpr_debug(\"\\n\");\n" - "-\tif (skb = NULL) {\t\t\t/* VCC was closed */\n" + "-\tif (skb == NULL) {\t\t\t/* VCC was closed */\n" "+\tif (!skb) {\t\t\t/* VCC was closed */\n" " \t\tstruct module *module;\n" " \n" @@ -1020,7 +1020,7 @@ " \t\tskb_pull(skb, LLC_LEN);\n" " \t\tbreak;\n" " \tcase e_autodetect:\n" - "-\t\tif (pvcc->chan.ppp = NULL) {\t/* Not bound yet! */\n" + "-\t\tif (pvcc->chan.ppp == NULL) {\t/* Not bound yet! */\n" "+\t\tif (!pvcc->chan.ppp) {\t/* Not bound yet! */\n" " \t\t\tkfree_skb(skb);\n" " \t\t\treturn;\n" @@ -1037,7 +1037,7 @@ " \t\t\t}\n" " \t\t\tconsume_skb(skb);\n" " \t\t\tskb = n;\n" - "-\t\t\tif (skb = NULL) {\n" + "-\t\t\tif (skb == NULL) {\n" "+\t\t\tif (!skb) {\n" " \t\t\t\tbh_unlock_sock(sk_atm(vcc));\n" " \t\t\t\treturn DROP_PACKET;\n" @@ -1046,7 +1046,7 @@ " \t be.encaps != PPPOATM_ENCAPS_VC && be.encaps != PPPOATM_ENCAPS_LLC)\n" " \t\treturn -EINVAL;\n" " \tpvcc = kzalloc(sizeof(*pvcc), GFP_KERNEL);\n" - "-\tif (pvcc = NULL)\n" + "-\tif (pvcc == NULL)\n" "+\tif (!pvcc)\n" " \t\treturn -ENOMEM;\n" " \tpvcc->atmvcc = atmvcc;\n" @@ -1059,7 +1059,7 @@ " \tstruct vcc_state *state;\n" " \n" " \tstate = __seq_open_private(file, ops, sizeof(*state));\n" - "-\tif (state = NULL)\n" + "-\tif (state == NULL)\n" "+\tif (!state)\n" " \t\treturn -ENOMEM;\n" " \n" @@ -1067,4 +1067,4 @@ "-- \n" 2.14.2 -bb9188c31d6abc7bb369e40c8dc0094a5828270fb8b022e8965fd5f08c0beca9 +54f9167e15de60c4432eb8406fdbfe2af34fffc62de404efb0b40992243f299c
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.