diff options
| -rw-r--r-- | include/linux/netdevice.h | 2 | ||||
| -rw-r--r-- | net/atm/clip.c | 2 | ||||
| -rw-r--r-- | net/atm/signaling.c | 2 | ||||
| -rw-r--r-- | net/bluetooth/af_bluetooth.c | 2 | ||||
| -rw-r--r-- | net/bluetooth/hci_sysfs.c | 2 | ||||
| -rw-r--r-- | net/core/pktgen.c | 4 | ||||
| -rw-r--r-- | net/econet/af_econet.c | 2 | ||||
| -rw-r--r-- | net/ipv4/ipvs/ip_vs_sync.c | 2 | ||||
| -rw-r--r-- | net/ipv4/ipvs/ip_vs_xmit.c | 2 | ||||
| -rw-r--r-- | net/ipv4/netfilter/ip_nat_snmp_basic.c | 2 | ||||
| -rw-r--r-- | net/ipv6/addrconf.c | 2 | ||||
| -rw-r--r-- | net/ipv6/af_inet6.c | 6 | ||||
| -rw-r--r-- | net/ipv6/anycast.c | 8 | ||||
| -rw-r--r-- | net/ipv6/ip6_output.c | 2 | ||||
| -rw-r--r-- | net/ipv6/mcast.c | 68 | ||||
| -rw-r--r-- | net/irda/ircomm/ircomm_tty.c | 4 | ||||
| -rw-r--r-- | net/irda/irlmp.c | 6 | ||||
| -rw-r--r-- | net/sctp/protocol.c | 2 |
18 files changed, 60 insertions, 60 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 9f380143cec0..e9375f3ad5c4 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -565,7 +565,7 @@ typedef int gifconf_func_t(struct net_device * dev, char __user * bufptr, int le extern int register_gifconf(unsigned int family, gifconf_func_t * gifconf); static inline int unregister_gifconf(unsigned int family) { - return register_gifconf(family, 0); + return register_gifconf(family, NULL); } /* diff --git a/net/atm/clip.c b/net/atm/clip.c index c74d0f6a15a2..4417df3fafa6 100644 --- a/net/atm/clip.c +++ b/net/atm/clip.c @@ -998,7 +998,7 @@ static int __init atm_clip_init(void) /* so neigh_ifdown() doesn't complain */ clip_tbl.proxy_timer.data = 0; - clip_tbl.proxy_timer.function = 0; + clip_tbl.proxy_timer.function = NULL; init_timer(&clip_tbl.proxy_timer); skb_queue_head_init(&clip_tbl.proxy_queue); diff --git a/net/atm/signaling.c b/net/atm/signaling.c index 074fe5c7f869..1788799f401c 100644 --- a/net/atm/signaling.c +++ b/net/atm/signaling.c @@ -135,7 +135,7 @@ static int sigd_send(struct atm_vcc *vcc,struct sk_buff *skb) lock_sock(vcc->sk); if (vcc->sk->sk_ack_backlog == vcc->sk->sk_max_ack_backlog) { - sigd_enq(0,as_reject,vcc,NULL,NULL); + sigd_enq(NULL,as_reject,vcc,NULL,NULL); goto as_indicate_complete; } vcc->sk->sk_ack_backlog++; diff --git a/net/bluetooth/af_bluetooth.c b/net/bluetooth/af_bluetooth.c index 05f93ae1e1b8..e0fa1b0d0cd3 100644 --- a/net/bluetooth/af_bluetooth.c +++ b/net/bluetooth/af_bluetooth.c @@ -354,7 +354,7 @@ static int __init bt_init(void) /* Init socket cache */ bt_sock_cache = kmem_cache_create("bt_sock", sizeof(struct bt_sock), 0, - SLAB_HWCACHE_ALIGN, 0, 0); + SLAB_HWCACHE_ALIGN, NULL, NULL); if (!bt_sock_cache) { BT_ERR("Socket cache creation failed"); diff --git a/net/bluetooth/hci_sysfs.c b/net/bluetooth/hci_sysfs.c index 1b8039fb463f..314106635cad 100644 --- a/net/bluetooth/hci_sysfs.c +++ b/net/bluetooth/hci_sysfs.c @@ -91,7 +91,7 @@ static int bt_hotplug(struct class_device *cdev, char **envp, int num_envp, char if ((size <= 0) || (i >= num_envp)) return -ENOMEM; - envp[i] = 0; + envp[i] = NULL; return 0; } #endif diff --git a/net/core/pktgen.c b/net/core/pktgen.c index 3821caa36870..b385cc817913 100644 --- a/net/core/pktgen.c +++ b/net/core/pktgen.c @@ -1355,7 +1355,7 @@ static int __init init(void) pginfos[i].udp_dst_max = 9; sprintf(pginfos[i].fname, "net/%s/pg%i", PG_PROC_DIR, i); - pginfos[i].proc_ent = create_proc_entry(pginfos[i].fname, 0600, 0); + pginfos[i].proc_ent = create_proc_entry(pginfos[i].fname, 0600, NULL); if (!pginfos[i].proc_ent) { printk("pktgen: Error: cannot create net/%s/pg procfs entry.\n", PG_PROC_DIR); goto cleanup_mem; @@ -1366,7 +1366,7 @@ static int __init init(void) pginfos[i].proc_ent->owner = THIS_MODULE; sprintf(pginfos[i].busy_fname, "net/%s/pg_busy%i", PG_PROC_DIR, i); - pginfos[i].busy_proc_ent = create_proc_entry(pginfos[i].busy_fname, 0, 0); + pginfos[i].busy_proc_ent = create_proc_entry(pginfos[i].busy_fname, 0, NULL); if (!pginfos[i].busy_proc_ent) { printk("pktgen: Error: cannot create net/%s/pg_busy procfs entry.\n", PG_PROC_DIR); goto cleanup_mem; diff --git a/net/econet/af_econet.c b/net/econet/af_econet.c index 46215ba94c01..4c9d71fd3148 100644 --- a/net/econet/af_econet.c +++ b/net/econet/af_econet.c @@ -1091,7 +1091,7 @@ static int econet_notifier(struct notifier_block *this, unsigned long msg, void if (edev) { if (net2dev_map[0] == dev) - net2dev_map[0] = 0; + net2dev_map[0] = NULL; net2dev_map[edev->net] = NULL; kfree(edev); dev->ec_ptr = NULL; diff --git a/net/ipv4/ipvs/ip_vs_sync.c b/net/ipv4/ipvs/ip_vs_sync.c index 7b727a92b9d7..e7f3f28a70a5 100644 --- a/net/ipv4/ipvs/ip_vs_sync.c +++ b/net/ipv4/ipvs/ip_vs_sync.c @@ -593,7 +593,7 @@ ip_vs_receive(struct socket *sock, char *buffer, const size_t buflen) /* Receive a packet */ iov.iov_base = buffer; iov.iov_len = (size_t)buflen; - msg.msg_name = 0; + msg.msg_name = NULL; msg.msg_namelen = 0; msg.msg_iov = &iov; msg.msg_iovlen = 1; diff --git a/net/ipv4/ipvs/ip_vs_xmit.c b/net/ipv4/ipvs/ip_vs_xmit.c index 4d83f001398a..204767be411e 100644 --- a/net/ipv4/ipvs/ip_vs_xmit.c +++ b/net/ipv4/ipvs/ip_vs_xmit.c @@ -51,7 +51,7 @@ __ip_vs_dst_check(struct ip_vs_dest *dest, u32 rtos, u32 cookie) return NULL; if ((dst->obsolete || rtos != dest->dst_rtos) && dst->ops->check(dst, cookie) == NULL) { - dest->dst_cache = 0; + dest->dst_cache = NULL; return NULL; } dst_hold(dst); diff --git a/net/ipv4/netfilter/ip_nat_snmp_basic.c b/net/ipv4/netfilter/ip_nat_snmp_basic.c index 00b4effb65f6..23854e0ec26f 100644 --- a/net/ipv4/netfilter/ip_nat_snmp_basic.c +++ b/net/ipv4/netfilter/ip_nat_snmp_basic.c @@ -252,7 +252,7 @@ static unsigned char asn1_header_decode(struct asn1_ctx *ctx, if (def) *eoc = ctx->pointer + len; else - *eoc = 0; + *eoc = NULL; return 1; } diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 065a11e6caea..3032aaadeb98 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -696,7 +696,7 @@ retry: ift = !max_addresses || ipv6_count_addresses(idev) < max_addresses ? ipv6_add_addr(idev, &addr, tmp_plen, - ipv6_addr_type(&addr)&IPV6_ADDR_SCOPE_MASK, IFA_F_TEMPORARY) : 0; + ipv6_addr_type(&addr)&IPV6_ADDR_SCOPE_MASK, IFA_F_TEMPORARY) : NULL; if (!ift || IS_ERR(ift)) { in6_dev_put(idev); in6_ifa_put(ifp); diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c index 0cf2ee00d257..980687f39c8f 100644 --- a/net/ipv6/af_inet6.c +++ b/net/ipv6/af_inet6.c @@ -719,13 +719,13 @@ static int __init inet6_init(void) /* allocate our sock slab caches */ tcp6_sk_cachep = kmem_cache_create("tcp6_sock", sizeof(struct tcp6_sock), 0, - SLAB_HWCACHE_ALIGN, 0, 0); + SLAB_HWCACHE_ALIGN, NULL, NULL); udp6_sk_cachep = kmem_cache_create("udp6_sock", sizeof(struct udp6_sock), 0, - SLAB_HWCACHE_ALIGN, 0, 0); + SLAB_HWCACHE_ALIGN, NULL, NULL); raw6_sk_cachep = kmem_cache_create("raw6_sock", sizeof(struct raw6_sock), 0, - SLAB_HWCACHE_ALIGN, 0, 0); + SLAB_HWCACHE_ALIGN, NULL, NULL); if (!tcp6_sk_cachep || !udp6_sk_cachep || !raw6_sk_cachep) printk(KERN_CRIT "%s: Can't create protocol sock SLAB " "caches!\n", __FUNCTION__); diff --git a/net/ipv6/anycast.c b/net/ipv6/anycast.c index c966d0628e84..5b1e4d959f4a 100644 --- a/net/ipv6/anycast.c +++ b/net/ipv6/anycast.c @@ -202,7 +202,7 @@ int ipv6_sock_ac_drop(struct sock *sk, int ifindex, struct in6_addr *addr) struct ipv6_ac_socklist *pac, *prev_pac; write_lock_bh(&ipv6_sk_ac_lock); - prev_pac = 0; + prev_pac = NULL; for (pac = np->ipv6_ac_list; pac; pac = pac->acl_next) { if ((ifindex == 0 || pac->acl_ifindex == ifindex) && ipv6_addr_cmp(&pac->acl_addr, addr) == 0) @@ -232,13 +232,13 @@ int ipv6_sock_ac_drop(struct sock *sk, int ifindex, struct in6_addr *addr) void ipv6_sock_ac_close(struct sock *sk) { struct ipv6_pinfo *np = inet6_sk(sk); - struct net_device *dev = 0; + struct net_device *dev = NULL; struct ipv6_ac_socklist *pac; int prev_index; write_lock_bh(&ipv6_sk_ac_lock); pac = np->ipv6_ac_list; - np->ipv6_ac_list = 0; + np->ipv6_ac_list = NULL; write_unlock_bh(&ipv6_sk_ac_lock); prev_index = 0; @@ -373,7 +373,7 @@ int ipv6_dev_ac_dec(struct net_device *dev, struct in6_addr *addr) return -ENODEV; write_lock_bh(&idev->lock); - prev_aca = 0; + prev_aca = NULL; for (aca = idev->ac_list; aca; aca = aca->aca_next) { if (ipv6_addr_cmp(&aca->aca_addr, addr) == 0) break; diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index d679b24644a9..8791db72567d 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c @@ -561,7 +561,7 @@ static int ip6_fragment(struct sk_buff **pskb, int (*output)(struct sk_buff**)) err = 0; offset = 0; frag = skb_shinfo(skb)->frag_list; - skb_shinfo(skb)->frag_list = 0; + skb_shinfo(skb)->frag_list = NULL; /* BUILD HEADER */ tmp_hdr = kmalloc(hlen, GFP_ATOMIC); diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c index f6d651dde985..da0719aff2a0 100644 --- a/net/ipv6/mcast.c +++ b/net/ipv6/mcast.c @@ -210,7 +210,7 @@ int ipv6_sock_mc_join(struct sock *sk, int ifindex, struct in6_addr *addr) mc_lst->ifindex = dev->ifindex; mc_lst->sfmode = MCAST_EXCLUDE; - mc_lst->sflist = 0; + mc_lst->sflist = NULL; /* * now add/increase the group membership on the device @@ -272,8 +272,8 @@ int ipv6_sock_mc_drop(struct sock *sk, int ifindex, struct in6_addr *addr) struct inet6_dev *ip6_mc_find_dev(struct in6_addr *group, int ifindex) { - struct net_device *dev = 0; - struct inet6_dev *idev = 0; + struct net_device *dev = NULL; + struct inet6_dev *idev = NULL; if (ifindex == 0) { struct rt6_info *rt; @@ -288,18 +288,18 @@ struct inet6_dev *ip6_mc_find_dev(struct in6_addr *group, int ifindex) dev = dev_get_by_index(ifindex); if (!dev) - return 0; + return NULL; idev = in6_dev_get(dev); if (!idev) { dev_put(dev); - return 0; + return NULL; } read_lock_bh(&idev->lock); if (idev->dead) { read_unlock_bh(&idev->lock); in6_dev_put(idev); dev_put(dev); - return 0; + return NULL; } return idev; } @@ -378,8 +378,8 @@ int ip6_mc_source(int add, int omode, struct sock *sk, goto done; } else if (pmc->sfmode != omode) { /* allow mode switches for empty-set filters */ - ip6_mc_add_src(idev, group, omode, 0, 0, 0); - ip6_mc_del_src(idev, group, pmc->sfmode, 0, 0, 0); + ip6_mc_add_src(idev, group, omode, 0, NULL, 0); + ip6_mc_del_src(idev, group, pmc->sfmode, 0, NULL, 0); pmc->sfmode = omode; } @@ -509,14 +509,14 @@ int ip6_mc_msfilter(struct sock *sk, struct group_filter *gsf) goto done; } } else - newpsl = 0; + newpsl = NULL; psl = pmc->sflist; if (psl) { (void) ip6_mc_del_src(idev, group, pmc->sfmode, psl->sl_count, psl->sl_addr, 0); sock_kfree_s(sk, psl, IP6_SFLSIZE(psl->sl_max)); } else - (void) ip6_mc_del_src(idev, group, pmc->sfmode, 0, 0, 0); + (void) ip6_mc_del_src(idev, group, pmc->sfmode, 0, NULL, 0); pmc->sflist = newpsl; pmc->sfmode = gsf->gf_fmode; done: @@ -718,7 +718,7 @@ static void mld_add_delrec(struct inet6_dev *idev, struct ifmcaddr6 *im) pmc->mca_tomb = im->mca_tomb; pmc->mca_sources = im->mca_sources; - im->mca_tomb = im->mca_sources = 0; + im->mca_tomb = im->mca_sources = NULL; for (psf=pmc->mca_sources; psf; psf=psf->sf_next) psf->sf_crcount = pmc->mca_crcount; } @@ -736,7 +736,7 @@ static void mld_del_delrec(struct inet6_dev *idev, struct in6_addr *pmca) struct ip6_sf_list *psf, *psf_next; write_lock_bh(&idev->mc_lock); - pmc_prev = 0; + pmc_prev = NULL; for (pmc=idev->mc_tomb; pmc; pmc=pmc->next) { if (ipv6_addr_cmp(&pmc->mca_addr, pmca) == 0) break; @@ -765,7 +765,7 @@ static void mld_clear_delrec(struct inet6_dev *idev) write_lock_bh(&idev->mc_lock); pmc = idev->mc_tomb; - idev->mc_tomb = 0; + idev->mc_tomb = NULL; write_unlock_bh(&idev->mc_lock); for (; pmc; pmc = nextpmc) { @@ -782,7 +782,7 @@ static void mld_clear_delrec(struct inet6_dev *idev) spin_lock_bh(&pmc->mca_lock); psf = pmc->mca_tomb; - pmc->mca_tomb = 0; + pmc->mca_tomb = NULL; spin_unlock_bh(&pmc->mca_lock); for (; psf; psf=psf_next) { psf_next = psf->sf_next; @@ -818,7 +818,7 @@ int ipv6_dev_mc_inc(struct net_device *dev, struct in6_addr *addr) mc->mca_users++; write_unlock_bh(&idev->lock); ip6_mc_add_src(idev, &mc->mca_addr, MCAST_EXCLUDE, 0, - 0, 0); + NULL, 0); in6_dev_put(idev); return 0; } @@ -1274,7 +1274,7 @@ static struct sk_buff *mld_newpack(struct net_device *dev, int size) skb = sock_alloc_send_skb(sk, size + LL_RESERVED_SPACE(dev), 1, &err); if (skb == 0) - return 0; + return NULL; skb_reserve(skb, LL_RESERVED_SPACE(dev)); if (dev->hard_header) { @@ -1283,7 +1283,7 @@ static struct sk_buff *mld_newpack(struct net_device *dev, int size) ndisc_mc_map(&mld2_all_mcr, ha, dev, 1); if (dev->hard_header(skb, dev, ETH_P_IPV6,ha,NULL,size) < 0) { kfree_skb(skb); - return 0; + return NULL; } } @@ -1352,7 +1352,7 @@ static struct sk_buff *add_grhead(struct sk_buff *skb, struct ifmcaddr6 *pmc, if (!skb) skb = mld_newpack(dev, dev->mtu); if (!skb) - return 0; + return NULL; pgr = (struct mld2_grec *)skb_put(skb, sizeof(struct mld2_grec)); pgr->grec_type = type; pgr->grec_auxwords = 0; @@ -1372,7 +1372,7 @@ static struct sk_buff *add_grec(struct sk_buff *skb, struct ifmcaddr6 *pmc, { struct net_device *dev = pmc->idev->dev; struct mld2_report *pmr; - struct mld2_grec *pgr = 0; + struct mld2_grec *pgr = NULL; struct ip6_sf_list *psf, *psf_next, *psf_prev, **psf_list; int scount, first, isquery, truncate; @@ -1397,13 +1397,13 @@ static struct sk_buff *add_grec(struct sk_buff *skb, struct ifmcaddr6 *pmc, if (skb && AVAILABLE(skb) < sizeof(struct mld2_grec)+ sizeof(struct in6_addr)) { mld_sendpack(skb); - skb = 0; /* add_grhead will get a new one */ + skb = NULL; /* add_grhead will get a new one */ } skb = add_grhead(skb, pmc, type, &pgr); } return skb; } - pmr = skb ? (struct mld2_report *)skb->h.raw : 0; + pmr = skb ? (struct mld2_report *)skb->h.raw : NULL; /* EX and TO_EX get a fresh packet, if needed */ if (truncate) { @@ -1416,7 +1416,7 @@ static struct sk_buff *add_grec(struct sk_buff *skb, struct ifmcaddr6 *pmc, } first = 1; scount = 0; - psf_prev = 0; + psf_prev = NULL; for (psf=*psf_list; psf; psf=psf_next) { struct in6_addr *psrc; @@ -1474,7 +1474,7 @@ static struct sk_buff *add_grec(struct sk_buff *skb, struct ifmcaddr6 *pmc, static void mld_send_report(struct inet6_dev *idev, struct ifmcaddr6 *pmc) { - struct sk_buff *skb = 0; + struct sk_buff *skb = NULL; int type; if (!pmc) { @@ -1511,7 +1511,7 @@ static void mld_clear_zeros(struct ip6_sf_list **ppsf) { struct ip6_sf_list *psf_prev, *psf_next, *psf; - psf_prev = 0; + psf_prev = NULL; for (psf=*ppsf; psf; psf = psf_next) { psf_next = psf->sf_next; if (psf->sf_crcount == 0) { @@ -1528,14 +1528,14 @@ static void mld_clear_zeros(struct ip6_sf_list **ppsf) static void mld_send_cr(struct inet6_dev *idev) { struct ifmcaddr6 *pmc, *pmc_prev, *pmc_next; - struct sk_buff *skb = 0; + struct sk_buff *skb = NULL; int type, dtype; read_lock_bh(&idev->lock); write_lock_bh(&idev->mc_lock); /* deleted MCA's */ - pmc_prev = 0; + pmc_prev = NULL; for (pmc=idev->mc_tomb; pmc; pmc=pmc_next) { pmc_next = pmc->next; if (pmc->mca_sfmode == MCAST_INCLUDE) { @@ -1691,7 +1691,7 @@ static int ip6_mc_del1_src(struct ifmcaddr6 *pmc, int sfmode, struct ip6_sf_list *psf, *psf_prev; int rv = 0; - psf_prev = 0; + psf_prev = NULL; for (psf=pmc->mca_sources; psf; psf=psf->sf_next) { if (ipv6_addr_cmp(&psf->sf_addr, psfsrc) == 0) break; @@ -1786,7 +1786,7 @@ static int ip6_mc_add1_src(struct ifmcaddr6 *pmc, int sfmode, { struct ip6_sf_list *psf, *psf_prev; - psf_prev = 0; + psf_prev = NULL; for (psf=pmc->mca_sources; psf; psf=psf->sf_next) { if (ipv6_addr_cmp(&psf->sf_addr, psfsrc) == 0) break; @@ -1914,12 +1914,12 @@ static void ip6_mc_clear_src(struct ifmcaddr6 *pmc) nextpsf = psf->sf_next; kfree(psf); } - pmc->mca_tomb = 0; + pmc->mca_tomb = NULL; for (psf=pmc->mca_sources; psf; psf=nextpsf) { nextpsf = psf->sf_next; kfree(psf); } - pmc->mca_sources = 0; + pmc->mca_sources = NULL; pmc->mca_sfmode = MCAST_EXCLUDE; pmc->mca_sfcount[MCAST_EXCLUDE] = 0; pmc->mca_sfcount[MCAST_EXCLUDE] = 1; @@ -1956,12 +1956,12 @@ int ip6_mc_leave_src(struct sock *sk, struct ipv6_mc_socklist *iml, if (iml->sflist == 0) { /* any-source empty exclude case */ - return ip6_mc_del_src(idev, &iml->addr, iml->sfmode, 0, 0, 0); + return ip6_mc_del_src(idev, &iml->addr, iml->sfmode, 0, NULL, 0); } err = ip6_mc_del_src(idev, &iml->addr, iml->sfmode, iml->sflist->sl_count, iml->sflist->sl_addr, 0); sock_kfree_s(sk, iml->sflist, IP6_SFLSIZE(iml->sflist->sl_max)); - iml->sflist = 0; + iml->sflist = NULL; return err; } @@ -1982,7 +1982,7 @@ static void mld_gq_timer_expire(unsigned long data) struct inet6_dev *idev = (struct inet6_dev *)data; idev->mc_gq_running = 0; - mld_send_report(idev, 0); + mld_send_report(idev, NULL); __in6_dev_put(idev); } @@ -2074,7 +2074,7 @@ void ipv6_mc_init_dev(struct inet6_dev *idev) init_timer(&idev->mc_gq_timer); idev->mc_gq_timer.data = (unsigned long) idev; idev->mc_gq_timer.function = &mld_gq_timer_expire; - idev->mc_tomb = 0; + idev->mc_tomb = NULL; idev->mc_ifc_count = 0; init_timer(&idev->mc_ifc_timer); idev->mc_ifc_timer.data = (unsigned long) idev; diff --git a/net/irda/ircomm/ircomm_tty.c b/net/irda/ircomm/ircomm_tty.c index f348c0caf7a0..f0c93caf601c 100644 --- a/net/irda/ircomm/ircomm_tty.c +++ b/net/irda/ircomm/ircomm_tty.c @@ -561,7 +561,7 @@ static void ircomm_tty_close(struct tty_struct *tty, struct file *filp) tty->ldisc.flush_buffer(tty); tty->closing = 0; - self->tty = 0; + self->tty = NULL; if (self->blocked_open) { if (self->close_delay) { @@ -1045,7 +1045,7 @@ static void ircomm_tty_hangup(struct tty_struct *tty) /* I guess we need to lock here - Jean II */ spin_lock_irqsave(&self->spinlock, flags); self->flags &= ~ASYNC_NORMAL_ACTIVE; - self->tty = 0; + self->tty = NULL; self->open_count = 0; spin_unlock_irqrestore(&self->spinlock, flags); diff --git a/net/irda/irlmp.c b/net/irda/irlmp.c index d16ce9bb855c..320940a5c687 100644 --- a/net/irda/irlmp.c +++ b/net/irda/irlmp.c @@ -1491,7 +1491,7 @@ void *irlmp_register_service(__u16 hints) service = kmalloc(sizeof(irlmp_service_t), GFP_ATOMIC); if (!service) { IRDA_DEBUG(1, "%s(), Unable to kmalloc!\n", __FUNCTION__); - return 0; + return NULL; } service->hints.word = hints; hashbin_insert(irlmp->services, (irda_queue_t *) service, @@ -1561,13 +1561,13 @@ void *irlmp_register_client(__u16 hint_mask, DISCOVERY_CALLBACK1 disco_clb, irlmp_client_t *client; IRDA_DEBUG(1, "%s()\n", __FUNCTION__); - ASSERT(irlmp != NULL, return 0;); + ASSERT(irlmp != NULL, return NULL;); /* Make a new registration */ client = kmalloc(sizeof(irlmp_client_t), GFP_ATOMIC); if (!client) { IRDA_DEBUG( 1, "%s(), Unable to kmalloc!\n", __FUNCTION__); - return 0; + return NULL; } /* Register the details */ diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c index 15cd8adf3c84..30b79d8ee8cb 100644 --- a/net/sctp/protocol.c +++ b/net/sctp/protocol.c @@ -134,7 +134,7 @@ void sctp_proc_exit(void) if (proc_net_sctp) { proc_net_sctp = NULL; - remove_proc_entry("net/sctp", 0); + remove_proc_entry("net/sctp", NULL); } } |
