asgardius/android_kernel_motorola_sm6225
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

addrconf: checkpatch fixes

Browse source 
Fix some of the checkpatch complaints.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Stephen Hemminger 2010-03-20 16:09:01 -07:00 committed by David S. Miller
parent bcdd553fd3
commit e21e8467d3
1 changed files with 179 additions and 173 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

352
net/ipv6/addrconf.c
View file

@ -81,7 +81,7 @@
#include <linux/random.h> #include <linux/random.h>
#endif #endif
#include <asm/uaccess.h> #include <linux/uaccess.h>
#include <asm/unaligned.h> #include <asm/unaligned.h>
#include <linux/proc_fs.h> #include <linux/proc_fs.h>
@ -97,7 +97,7 @@
#endif #endif
#define INFINITY_LIFE_TIME 0xFFFFFFFF #define INFINITY_LIFE_TIME 0xFFFFFFFF
#define TIME_DELTA(a,b) ((unsigned long)((long)(a) - (long)(b))) #define TIME_DELTA(a, b) ((unsigned long)((long)(a) - (long)(b)))
#ifdef CONFIG_SYSCTL #ifdef CONFIG_SYSCTL
static void addrconf_sysctl_register(struct inet6_dev *idev); static void addrconf_sysctl_register(struct inet6_dev *idev);
@ -249,8 +249,7 @@ static void addrconf_del_timer(struct inet6_ifaddr *ifp)
__in6_ifa_put(ifp); __in6_ifa_put(ifp);
} }
enum addrconf_timer_t enum addrconf_timer_t {
{
AC_NONE, AC_NONE,
AC_DAD, AC_DAD,
AC_RS, AC_RS,
@ -270,7 +269,8 @@ static void addrconf_mod_timer(struct inet6_ifaddr *ifp,
case AC_RS: case AC_RS:
ifp->timer.function = addrconf_rs_timer; ifp->timer.function = addrconf_rs_timer;
break; break;
default:; default:
break;
} }
ifp->timer.expires = jiffies + when; ifp->timer.expires = jiffies + when;
add_timer(&ifp->timer); add_timer(&ifp->timer);
@ -325,7 +325,7 @@ void in6_dev_finish_destroy(struct inet6_dev *idev)
#endif #endif
dev_put(dev); dev_put(dev);
if (!idev->dead) { if (!idev->dead) {
printk("Freeing alive inet6 device %p\n", idev); pr_warning("Freeing alive inet6 device %p\n", idev);
return; return;
} }
snmp6_free_dev(idev); snmp6_free_dev(idev);
@ -441,8 +441,10 @@ static struct inet6_dev * ipv6_find_idev(struct net_device *dev)
ASSERT_RTNL(); ASSERT_RTNL();
if ((idev = __in6_dev_get(dev)) == NULL) { idev = __in6_dev_get(dev);
if ((idev = ipv6_add_dev(dev)) == NULL) if (!idev) {
idev = ipv6_add_dev(dev);
if (!idev)
return NULL; return NULL;
} }
@ -544,10 +546,10 @@ void inet6_ifa_finish_destroy(struct inet6_ifaddr *ifp)
in6_dev_put(ifp->idev); in6_dev_put(ifp->idev);
if (del_timer(&ifp->timer)) if (del_timer(&ifp->timer))
printk("Timer is still running, when freeing ifa=%p\n", ifp); pr_notice("Timer is still running, when freeing ifa=%p\n", ifp);
if (!ifp->dead) { if (!ifp->dead) {
printk("Freeing alive inet6 address %p\n", ifp); pr_warning("Freeing alive inet6 address %p\n", ifp);
return; return;
} }
dst_release(&ifp->rt->u.dst); dst_release(&ifp->rt->u.dst);
@ -1225,7 +1227,6 @@ try_nextdev:
in6_ifa_put(hiscore->ifa); in6_ifa_put(hiscore->ifa);
return 0; return 0;
} }
EXPORT_SYMBOL(ipv6_dev_get_saddr); EXPORT_SYMBOL(ipv6_dev_get_saddr);
int ipv6_get_lladdr(struct net_device *dev, struct in6_addr *addr, int ipv6_get_lladdr(struct net_device *dev, struct in6_addr *addr,
@ -1235,7 +1236,8 @@ int ipv6_get_lladdr(struct net_device *dev, struct in6_addr *addr,
int err = -EADDRNOTAVAIL; int err = -EADDRNOTAVAIL;
rcu_read_lock(); rcu_read_lock();
if ((idev = __in6_dev_get(dev)) != NULL) { idev = __in6_dev_get(dev);
if (idev) {
struct inet6_ifaddr *ifp; struct inet6_ifaddr *ifp;
read_lock_bh(&idev->lock); read_lock_bh(&idev->lock);
@ -1725,7 +1727,8 @@ static struct inet6_dev *addrconf_add_dev(struct net_device *dev)
ASSERT_RTNL(); ASSERT_RTNL();
if ((idev = ipv6_find_idev(dev)) == NULL) idev = ipv6_find_idev(dev);
if (!idev)
return NULL; return NULL;
/* Add default multicast route */ /* Add default multicast route */
@ -2433,7 +2436,8 @@ static void addrconf_ip6_tnl_config(struct net_device *dev)
ASSERT_RTNL(); ASSERT_RTNL();
if ((idev = addrconf_add_dev(dev)) == NULL) { idev = addrconf_add_dev(dev);
if (!idev) {
printk(KERN_DEBUG "init ip6-ip6: add_dev failed\n"); printk(KERN_DEBUG "init ip6-ip6: add_dev failed\n");
return; return;
} }
@ -2448,7 +2452,7 @@ static int addrconf_notify(struct notifier_block *this, unsigned long event,
int run_pending = 0; int run_pending = 0;
int err; int err;
switch(event) { switch (event) {
case NETDEV_REGISTER: case NETDEV_REGISTER:
if (!idev && dev->mtu >= IPV6_MIN_MTU) { if (!idev && dev->mtu >= IPV6_MIN_MTU) {
idev = ipv6_add_dev(dev); idev = ipv6_add_dev(dev);
@ -2500,7 +2504,7 @@ static int addrconf_notify(struct notifier_block *this, unsigned long event,
run_pending = 1; run_pending = 1;
} }
switch(dev->type) { switch (dev->type) {
#if defined(CONFIG_IPV6_SIT) || defined(CONFIG_IPV6_SIT_MODULE) #if defined(CONFIG_IPV6_SIT) || defined(CONFIG_IPV6_SIT_MODULE)
case ARPHRD_SIT: case ARPHRD_SIT:
addrconf_sit_config(dev); addrconf_sit_config(dev);
@ -2837,7 +2841,7 @@ static void addrconf_dad_start(struct inet6_ifaddr *ifp, u32 flags)
* Optimistic nodes can start receiving * Optimistic nodes can start receiving
* Frames right away * Frames right away
*/ */
if(ifp->flags & IFA_F_OPTIMISTIC) if (ifp->flags & IFA_F_OPTIMISTIC)
ip6_ins_rt(ifp->rt); ip6_ins_rt(ifp->rt);
addrconf_dad_kick(ifp); addrconf_dad_kick(ifp);
@ -2887,7 +2891,7 @@ out:
static void addrconf_dad_completed(struct inet6_ifaddr *ifp) static void addrconf_dad_completed(struct inet6_ifaddr *ifp)
{ {
struct net_device * dev = ifp->idev->dev; struct net_device *dev = ifp->idev->dev;
/* /*
* Configure the address for reception. Now it is valid. * Configure the address for reception. Now it is valid.
@ -2918,7 +2922,8 @@ static void addrconf_dad_completed(struct inet6_ifaddr *ifp)
} }
} }
static void addrconf_dad_run(struct inet6_dev *idev) { static void addrconf_dad_run(struct inet6_dev *idev)
{
struct inet6_ifaddr *ifp; struct inet6_ifaddr *ifp;
read_lock_bh(&idev->lock); read_lock_bh(&idev->lock);
@ -2983,7 +2988,7 @@ static struct inet6_ifaddr *if6_get_idx(struct seq_file *seq, loff_t pos)
struct inet6_ifaddr *ifa = if6_get_first(seq); struct inet6_ifaddr *ifa = if6_get_first(seq);
if (ifa) if (ifa)
while(pos && (ifa = if6_get_next(seq, ifa)) != NULL) while (pos && (ifa = if6_get_next(seq, ifa)) != NULL)
--pos; --pos;
return pos ? NULL : ifa; return pos ? NULL : ifa;
} }
@ -3492,8 +3497,7 @@ static int inet6_fill_ifacaddr(struct sk_buff *skb, struct ifacaddr6 *ifaca,
return nlmsg_end(skb, nlh); return nlmsg_end(skb, nlh);
} }
enum addr_type_t enum addr_type_t {
{
UNICAST_ADDR, UNICAST_ADDR,
MULTICAST_ADDR, MULTICAST_ADDR,
ANYCAST_ADDR, ANYCAST_ADDR,
@ -3592,7 +3596,8 @@ static int inet6_dump_addr(struct sk_buff *skb, struct netlink_callback *cb,
if (idx > s_idx) if (idx > s_idx)
s_ip_idx = 0; s_ip_idx = 0;
ip_idx = 0; ip_idx = 0;
if ((idev = __in6_dev_get(dev)) == NULL) idev = __in6_dev_get(dev);
if (!idev)
goto cont; goto cont;
if (in6_dump_addrs(idev, skb, cb, type, if (in6_dump_addrs(idev, skb, cb, type,
@ -3659,12 +3664,14 @@ static int inet6_rtm_getaddr(struct sk_buff *in_skb, struct nlmsghdr* nlh,
if (ifm->ifa_index) if (ifm->ifa_index)
dev = __dev_get_by_index(net, ifm->ifa_index); dev = __dev_get_by_index(net, ifm->ifa_index);
if ((ifa = ipv6_get_ifaddr(net, addr, dev, 1)) == NULL) { ifa = ipv6_get_ifaddr(net, addr, dev, 1);
if (!ifa) {
err = -EADDRNOTAVAIL; err = -EADDRNOTAVAIL;
goto errout; goto errout;
} }
if ((skb = nlmsg_new(inet6_ifaddr_msgsize(), GFP_KERNEL)) == NULL) { skb = nlmsg_new(inet6_ifaddr_msgsize(), GFP_KERNEL);
if (!skb) {
err = -ENOBUFS; err = -ENOBUFS;
goto errout_ifa; goto errout_ifa;
} }
@ -3789,7 +3796,7 @@ static inline void __snmp6_fill_stats(u64 *stats, void __percpu **mib,
static void snmp6_fill_stats(u64 *stats, struct inet6_dev *idev, int attrtype, static void snmp6_fill_stats(u64 *stats, struct inet6_dev *idev, int attrtype,
int bytes) int bytes)
{ {
switch(attrtype) { switch (attrtype) {
case IFLA_INET6_STATS: case IFLA_INET6_STATS:
__snmp6_fill_stats(stats, (void __percpu **)idev->stats.ipv6, IPSTATS_MIB_MAX, bytes); __snmp6_fill_stats(stats, (void __percpu **)idev->stats.ipv6, IPSTATS_MIB_MAX, bytes);
break; break;
@ -4141,211 +4148,211 @@ static struct addrconf_sysctl_table
.sysctl_header = NULL, .sysctl_header = NULL,
.addrconf_vars = { .addrconf_vars = {
{ {
.procname = "forwarding", .procname = "forwarding",
.data = &ipv6_devconf.forwarding, .data = &ipv6_devconf.forwarding,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = addrconf_sysctl_forward, .proc_handler = addrconf_sysctl_forward,
}, },
{ {
.procname = "hop_limit", .procname = "hop_limit",
.data = &ipv6_devconf.hop_limit, .data = &ipv6_devconf.hop_limit,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec, .proc_handler = proc_dointvec,
}, },
{ {
.procname = "mtu", .procname = "mtu",
.data = &ipv6_devconf.mtu6, .data = &ipv6_devconf.mtu6,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec, .proc_handler = proc_dointvec,
}, },
{ {
.procname = "accept_ra", .procname = "accept_ra",
.data = &ipv6_devconf.accept_ra, .data = &ipv6_devconf.accept_ra,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec, .proc_handler = proc_dointvec,
}, },
{ {
.procname = "accept_redirects", .procname = "accept_redirects",
.data = &ipv6_devconf.accept_redirects, .data = &ipv6_devconf.accept_redirects,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec, .proc_handler = proc_dointvec,
}, },
{ {
.procname = "autoconf", .procname = "autoconf",
.data = &ipv6_devconf.autoconf, .data = &ipv6_devconf.autoconf,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec, .proc_handler = proc_dointvec,
}, },
{ {
.procname = "dad_transmits", .procname = "dad_transmits",
.data = &ipv6_devconf.dad_transmits, .data = &ipv6_devconf.dad_transmits,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec, .proc_handler = proc_dointvec,
}, },
{ {
.procname = "router_solicitations", .procname = "router_solicitations",
.data = &ipv6_devconf.rtr_solicits, .data = &ipv6_devconf.rtr_solicits,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec, .proc_handler = proc_dointvec,
}, },
{ {
.procname = "router_solicitation_interval", .procname = "router_solicitation_interval",
.data = &ipv6_devconf.rtr_solicit_interval, .data = &ipv6_devconf.rtr_solicit_interval,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec_jiffies, .proc_handler = proc_dointvec_jiffies,
}, },
{ {
.procname = "router_solicitation_delay", .procname = "router_solicitation_delay",
.data = &ipv6_devconf.rtr_solicit_delay, .data = &ipv6_devconf.rtr_solicit_delay,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec_jiffies, .proc_handler = proc_dointvec_jiffies,
}, },
{ {
.procname = "force_mld_version", .procname = "force_mld_version",
.data = &ipv6_devconf.force_mld_version, .data = &ipv6_devconf.force_mld_version,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec, .proc_handler = proc_dointvec,
}, },
#ifdef CONFIG_IPV6_PRIVACY #ifdef CONFIG_IPV6_PRIVACY
{ {
.procname = "use_tempaddr", .procname = "use_tempaddr",
.data = &ipv6_devconf.use_tempaddr, .data = &ipv6_devconf.use_tempaddr,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec, .proc_handler = proc_dointvec,
}, },
{ {
.procname = "temp_valid_lft", .procname = "temp_valid_lft",
.data = &ipv6_devconf.temp_valid_lft, .data = &ipv6_devconf.temp_valid_lft,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec, .proc_handler = proc_dointvec,
}, },
{ {
.procname = "temp_prefered_lft", .procname = "temp_prefered_lft",
.data = &ipv6_devconf.temp_prefered_lft, .data = &ipv6_devconf.temp_prefered_lft,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec, .proc_handler = proc_dointvec,
}, },
{ {
.procname = "regen_max_retry", .procname = "regen_max_retry",
.data = &ipv6_devconf.regen_max_retry, .data = &ipv6_devconf.regen_max_retry,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec, .proc_handler = proc_dointvec,
}, },
{ {
.procname = "max_desync_factor", .procname = "max_desync_factor",
.data = &ipv6_devconf.max_desync_factor, .data = &ipv6_devconf.max_desync_factor,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec, .proc_handler = proc_dointvec,
}, },
#endif #endif
{ {
.procname = "max_addresses", .procname = "max_addresses",
.data = &ipv6_devconf.max_addresses, .data = &ipv6_devconf.max_addresses,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec, .proc_handler = proc_dointvec,
}, },
{ {
.procname = "accept_ra_defrtr", .procname = "accept_ra_defrtr",
.data = &ipv6_devconf.accept_ra_defrtr, .data = &ipv6_devconf.accept_ra_defrtr,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec, .proc_handler = proc_dointvec,
}, },
{ {
.procname = "accept_ra_pinfo", .procname = "accept_ra_pinfo",
.data = &ipv6_devconf.accept_ra_pinfo, .data = &ipv6_devconf.accept_ra_pinfo,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec, .proc_handler = proc_dointvec,
}, },
#ifdef CONFIG_IPV6_ROUTER_PREF #ifdef CONFIG_IPV6_ROUTER_PREF
{ {
.procname = "accept_ra_rtr_pref", .procname = "accept_ra_rtr_pref",
.data = &ipv6_devconf.accept_ra_rtr_pref, .data = &ipv6_devconf.accept_ra_rtr_pref,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec, .proc_handler = proc_dointvec,
}, },
{ {
.procname = "router_probe_interval", .procname = "router_probe_interval",
.data = &ipv6_devconf.rtr_probe_interval, .data = &ipv6_devconf.rtr_probe_interval,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec_jiffies, .proc_handler = proc_dointvec_jiffies,
}, },
#ifdef CONFIG_IPV6_ROUTE_INFO #ifdef CONFIG_IPV6_ROUTE_INFO
{ {
.procname = "accept_ra_rt_info_max_plen", .procname = "accept_ra_rt_info_max_plen",
.data = &ipv6_devconf.accept_ra_rt_info_max_plen, .data = &ipv6_devconf.accept_ra_rt_info_max_plen,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec, .proc_handler = proc_dointvec,
}, },
#endif #endif
#endif #endif
{ {
.procname = "proxy_ndp", .procname = "proxy_ndp",
.data = &ipv6_devconf.proxy_ndp, .data = &ipv6_devconf.proxy_ndp,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec, .proc_handler = proc_dointvec,
}, },
{ {
.procname = "accept_source_route", .procname = "accept_source_route",
.data = &ipv6_devconf.accept_source_route, .data = &ipv6_devconf.accept_source_route,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec, .proc_handler = proc_dointvec,
}, },
#ifdef CONFIG_IPV6_OPTIMISTIC_DAD #ifdef CONFIG_IPV6_OPTIMISTIC_DAD
{ {
.procname = "optimistic_dad", .procname = "optimistic_dad",
.data = &ipv6_devconf.optimistic_dad, .data = &ipv6_devconf.optimistic_dad,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec, .proc_handler = proc_dointvec,
}, },
#endif #endif
#ifdef CONFIG_IPV6_MROUTE #ifdef CONFIG_IPV6_MROUTE
{ {
.procname = "mc_forwarding", .procname = "mc_forwarding",
.data = &ipv6_devconf.mc_forwarding, .data = &ipv6_devconf.mc_forwarding,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0444, .mode = 0444,
.proc_handler = proc_dointvec, .proc_handler = proc_dointvec,
}, },
#endif #endif
{ {
.procname = "disable_ipv6", .procname = "disable_ipv6",
.data = &ipv6_devconf.disable_ipv6, .data = &ipv6_devconf.disable_ipv6,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = addrconf_sysctl_disable, .proc_handler = addrconf_sysctl_disable,
}, },
{ {
.procname = "accept_dad", .procname = "accept_dad",
.data = &ipv6_devconf.accept_dad, .data = &ipv6_devconf.accept_dad,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec, .proc_handler = proc_dointvec,
}, },
{ {
.procname = "force_tllao", .procname = "force_tllao",
@ -4382,7 +4389,7 @@ static int __addrconf_sysctl_register(struct net *net, char *dev_name,
goto out; goto out;
for (i = 0; t->addrconf_vars[i].data; i++) { for (i = 0; t->addrconf_vars[i].data; i++) {
t->addrconf_vars[i].data += (char*)p - (char*)&ipv6_devconf; t->addrconf_vars[i].data += (char *)p - (char *)&ipv6_devconf;
t->addrconf_vars[i].extra1 = idev; /* embedded; no ref */ t->addrconf_vars[i].extra1 = idev; /* embedded; no ref */
t->addrconf_vars[i].extra2 = net; t->addrconf_vars[i].extra2 = net;
} }
@ -4519,14 +4526,12 @@ int register_inet6addr_notifier(struct notifier_block *nb)
{ {
return atomic_notifier_chain_register(&inet6addr_chain, nb); return atomic_notifier_chain_register(&inet6addr_chain, nb);
} }
EXPORT_SYMBOL(register_inet6addr_notifier); EXPORT_SYMBOL(register_inet6addr_notifier);
int unregister_inet6addr_notifier(struct notifier_block *nb) int unregister_inet6addr_notifier(struct notifier_block *nb)
{ {
return atomic_notifier_chain_unregister(&inet6addr_chain,nb); return atomic_notifier_chain_unregister(&inet6addr_chain, nb);
} }
EXPORT_SYMBOL(unregister_inet6addr_notifier); EXPORT_SYMBOL(unregister_inet6addr_notifier);
/* /*
@ -4537,9 +4542,10 @@ int __init addrconf_init(void)
{ {
int i, err; int i, err;
if ((err = ipv6_addr_label_init()) < 0) { err = ipv6_addr_label_init();
printk(KERN_CRIT "IPv6 Addrconf: cannot initialize default policy table: %d.\n", if (err < 0) {
err); printk(KERN_CRIT "IPv6 Addrconf:"
" cannot initialize default policy table: %d.\n", err);
return err; return err;
} }