diff options
author | Eldad Zack <eldad@fogrefinery.com> | 2012-04-01 03:49:08 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-04-02 04:33:46 -0400 |
commit | 8e5e8f30d0dea1db2c8e2a78802e7e57f796f339 (patch) | |
tree | 0c439cbd1aa68568759387cefb373cd9d542a0ac /net/ipv6/addrconf.c | |
parent | a2d91a09dac71bf34a9a3e4b8fdda36f02788b52 (diff) |
net/ipv6/addrconf.c: Checkpatch cleanups
net/ipv6/addrconf.c:340: WARNING: EXPORT_SYMBOL(foo); should immediately follow its function/variable
net/ipv6/addrconf.c:342: ERROR: "foo * bar" should be "foo *bar"
net/ipv6/addrconf.c:444: ERROR: "foo * bar" should be "foo *bar"
net/ipv6/addrconf.c:1337: WARNING: EXPORT_SYMBOL(foo); should immediately follow its function/variable
net/ipv6/addrconf.c:1526: ERROR: "(foo*)" should be "(foo *)"
net/ipv6/addrconf.c:1671: ERROR: open brace '{' following function declarations go on the next line
net/ipv6/addrconf.c:1914: ERROR: "foo * bar" should be "foo *bar"
net/ipv6/addrconf.c:2368: ERROR: "foo * bar" should be "foo *bar"
net/ipv6/addrconf.c:2370: ERROR: "foo * bar" should be "foo *bar"
net/ipv6/addrconf.c:2416: ERROR: "foo * bar" should be "foo *bar"
net/ipv6/addrconf.c:2437: ERROR: "foo * bar" should be "foo *bar"
net/ipv6/addrconf.c:2573: ERROR: "foo * bar" should be "foo *bar"
net/ipv6/addrconf.c:3797: ERROR: "foo* bar" should be "foo *bar"
Signed-off-by: Eldad Zack <eldad@fogrefinery.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/addrconf.c')
-rw-r--r-- | net/ipv6/addrconf.c | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 153060f946e0..fcd230a6235a 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c | |||
@@ -336,10 +336,9 @@ void in6_dev_finish_destroy(struct inet6_dev *idev) | |||
336 | snmp6_free_dev(idev); | 336 | snmp6_free_dev(idev); |
337 | kfree_rcu(idev, rcu); | 337 | kfree_rcu(idev, rcu); |
338 | } | 338 | } |
339 | |||
340 | EXPORT_SYMBOL(in6_dev_finish_destroy); | 339 | EXPORT_SYMBOL(in6_dev_finish_destroy); |
341 | 340 | ||
342 | static struct inet6_dev * ipv6_add_dev(struct net_device *dev) | 341 | static struct inet6_dev *ipv6_add_dev(struct net_device *dev) |
343 | { | 342 | { |
344 | struct inet6_dev *ndev; | 343 | struct inet6_dev *ndev; |
345 | 344 | ||
@@ -441,7 +440,7 @@ static struct inet6_dev * ipv6_add_dev(struct net_device *dev) | |||
441 | return ndev; | 440 | return ndev; |
442 | } | 441 | } |
443 | 442 | ||
444 | static struct inet6_dev * ipv6_find_idev(struct net_device *dev) | 443 | static struct inet6_dev *ipv6_find_idev(struct net_device *dev) |
445 | { | 444 | { |
446 | struct inet6_dev *idev; | 445 | struct inet6_dev *idev; |
447 | 446 | ||
@@ -1333,7 +1332,6 @@ int ipv6_chk_prefix(const struct in6_addr *addr, struct net_device *dev) | |||
1333 | rcu_read_unlock(); | 1332 | rcu_read_unlock(); |
1334 | return onlink; | 1333 | return onlink; |
1335 | } | 1334 | } |
1336 | |||
1337 | EXPORT_SYMBOL(ipv6_chk_prefix); | 1335 | EXPORT_SYMBOL(ipv6_chk_prefix); |
1338 | 1336 | ||
1339 | struct inet6_ifaddr *ipv6_get_ifaddr(struct net *net, const struct in6_addr *addr, | 1337 | struct inet6_ifaddr *ipv6_get_ifaddr(struct net *net, const struct in6_addr *addr, |
@@ -1523,7 +1521,7 @@ static int addrconf_ifid_arcnet(u8 *eui, struct net_device *dev) | |||
1523 | if (dev->addr_len != ARCNET_ALEN) | 1521 | if (dev->addr_len != ARCNET_ALEN) |
1524 | return -1; | 1522 | return -1; |
1525 | memset(eui, 0, 7); | 1523 | memset(eui, 0, 7); |
1526 | eui[7] = *(u8*)dev->dev_addr; | 1524 | eui[7] = *(u8 *)dev->dev_addr; |
1527 | return 0; | 1525 | return 0; |
1528 | } | 1526 | } |
1529 | 1527 | ||
@@ -1668,7 +1666,8 @@ out: | |||
1668 | in6_dev_put(idev); | 1666 | in6_dev_put(idev); |
1669 | } | 1667 | } |
1670 | 1668 | ||
1671 | static int __ipv6_try_regen_rndid(struct inet6_dev *idev, struct in6_addr *tmpaddr) { | 1669 | static int __ipv6_try_regen_rndid(struct inet6_dev *idev, struct in6_addr *tmpaddr) |
1670 | { | ||
1672 | int ret = 0; | 1671 | int ret = 0; |
1673 | 1672 | ||
1674 | if (tmpaddr && memcmp(idev->rndid, &tmpaddr->s6_addr[8], 8) == 0) | 1673 | if (tmpaddr && memcmp(idev->rndid, &tmpaddr->s6_addr[8], 8) == 0) |
@@ -1911,7 +1910,7 @@ void addrconf_prefix_rcv(struct net_device *dev, u8 *opt, int len, bool sllao) | |||
1911 | /* Try to figure out our local address for this prefix */ | 1910 | /* Try to figure out our local address for this prefix */ |
1912 | 1911 | ||
1913 | if (pinfo->autoconf && in6_dev->cnf.autoconf) { | 1912 | if (pinfo->autoconf && in6_dev->cnf.autoconf) { |
1914 | struct inet6_ifaddr * ifp; | 1913 | struct inet6_ifaddr *ifp; |
1915 | struct in6_addr addr; | 1914 | struct in6_addr addr; |
1916 | int create = 0, update_lft = 0; | 1915 | int create = 0, update_lft = 0; |
1917 | 1916 | ||
@@ -2365,9 +2364,9 @@ static void sit_add_v4_addrs(struct inet6_dev *idev) | |||
2365 | } | 2364 | } |
2366 | 2365 | ||
2367 | for_each_netdev(net, dev) { | 2366 | for_each_netdev(net, dev) { |
2368 | struct in_device * in_dev = __in_dev_get_rtnl(dev); | 2367 | struct in_device *in_dev = __in_dev_get_rtnl(dev); |
2369 | if (in_dev && (dev->flags & IFF_UP)) { | 2368 | if (in_dev && (dev->flags & IFF_UP)) { |
2370 | struct in_ifaddr * ifa; | 2369 | struct in_ifaddr *ifa; |
2371 | 2370 | ||
2372 | int flag = scope; | 2371 | int flag = scope; |
2373 | 2372 | ||
@@ -2413,7 +2412,7 @@ static void init_loopback(struct net_device *dev) | |||
2413 | 2412 | ||
2414 | static void addrconf_add_linklocal(struct inet6_dev *idev, const struct in6_addr *addr) | 2413 | static void addrconf_add_linklocal(struct inet6_dev *idev, const struct in6_addr *addr) |
2415 | { | 2414 | { |
2416 | struct inet6_ifaddr * ifp; | 2415 | struct inet6_ifaddr *ifp; |
2417 | u32 addr_flags = IFA_F_PERMANENT; | 2416 | u32 addr_flags = IFA_F_PERMANENT; |
2418 | 2417 | ||
2419 | #ifdef CONFIG_IPV6_OPTIMISTIC_DAD | 2418 | #ifdef CONFIG_IPV6_OPTIMISTIC_DAD |
@@ -2434,7 +2433,7 @@ static void addrconf_add_linklocal(struct inet6_dev *idev, const struct in6_addr | |||
2434 | static void addrconf_dev_config(struct net_device *dev) | 2433 | static void addrconf_dev_config(struct net_device *dev) |
2435 | { | 2434 | { |
2436 | struct in6_addr addr; | 2435 | struct in6_addr addr; |
2437 | struct inet6_dev * idev; | 2436 | struct inet6_dev *idev; |
2438 | 2437 | ||
2439 | ASSERT_RTNL(); | 2438 | ASSERT_RTNL(); |
2440 | 2439 | ||
@@ -2570,7 +2569,7 @@ static void addrconf_ip6_tnl_config(struct net_device *dev) | |||
2570 | } | 2569 | } |
2571 | 2570 | ||
2572 | static int addrconf_notify(struct notifier_block *this, unsigned long event, | 2571 | static int addrconf_notify(struct notifier_block *this, unsigned long event, |
2573 | void * data) | 2572 | void *data) |
2574 | { | 2573 | { |
2575 | struct net_device *dev = (struct net_device *) data; | 2574 | struct net_device *dev = (struct net_device *) data; |
2576 | struct inet6_dev *idev = __in6_dev_get(dev); | 2575 | struct inet6_dev *idev = __in6_dev_get(dev); |
@@ -3794,7 +3793,7 @@ static int inet6_dump_ifacaddr(struct sk_buff *skb, struct netlink_callback *cb) | |||
3794 | return inet6_dump_addr(skb, cb, type); | 3793 | return inet6_dump_addr(skb, cb, type); |
3795 | } | 3794 | } |
3796 | 3795 | ||
3797 | static int inet6_rtm_getaddr(struct sk_buff *in_skb, struct nlmsghdr* nlh, | 3796 | static int inet6_rtm_getaddr(struct sk_buff *in_skb, struct nlmsghdr *nlh, |
3798 | void *arg) | 3797 | void *arg) |
3799 | { | 3798 | { |
3800 | struct net *net = sock_net(in_skb->sk); | 3799 | struct net *net = sock_net(in_skb->sk); |