Skip to content

Commit 8e5e8f3

Browse files
eldaddavem330
authored andcommitted
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 <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent a2d91a0 commit 8e5e8f3

File tree

1 file changed

+12
-13
lines changed

1 file changed

+12
-13
lines changed

net/ipv6/addrconf.c

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -336,10 +336,9 @@ void in6_dev_finish_destroy(struct inet6_dev *idev)
336336
snmp6_free_dev(idev);
337337
kfree_rcu(idev, rcu);
338338
}
339-
340339
EXPORT_SYMBOL(in6_dev_finish_destroy);
341340

342-
static struct inet6_dev * ipv6_add_dev(struct net_device *dev)
341+
static struct inet6_dev *ipv6_add_dev(struct net_device *dev)
343342
{
344343
struct inet6_dev *ndev;
345344

@@ -441,7 +440,7 @@ static struct inet6_dev * ipv6_add_dev(struct net_device *dev)
441440
return ndev;
442441
}
443442

444-
static struct inet6_dev * ipv6_find_idev(struct net_device *dev)
443+
static struct inet6_dev *ipv6_find_idev(struct net_device *dev)
445444
{
446445
struct inet6_dev *idev;
447446

@@ -1333,7 +1332,6 @@ int ipv6_chk_prefix(const struct in6_addr *addr, struct net_device *dev)
13331332
rcu_read_unlock();
13341333
return onlink;
13351334
}
1336-
13371335
EXPORT_SYMBOL(ipv6_chk_prefix);
13381336

13391337
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)
15231521
if (dev->addr_len != ARCNET_ALEN)
15241522
return -1;
15251523
memset(eui, 0, 7);
1526-
eui[7] = *(u8*)dev->dev_addr;
1524+
eui[7] = *(u8 *)dev->dev_addr;
15271525
return 0;
15281526
}
15291527

@@ -1668,7 +1666,8 @@ static void ipv6_regen_rndid(unsigned long data)
16681666
in6_dev_put(idev);
16691667
}
16701668

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+
{
16721671
int ret = 0;
16731672

16741673
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)
19111910
/* Try to figure out our local address for this prefix */
19121911

19131912
if (pinfo->autoconf && in6_dev->cnf.autoconf) {
1914-
struct inet6_ifaddr * ifp;
1913+
struct inet6_ifaddr *ifp;
19151914
struct in6_addr addr;
19161915
int create = 0, update_lft = 0;
19171916

@@ -2365,9 +2364,9 @@ static void sit_add_v4_addrs(struct inet6_dev *idev)
23652364
}
23662365

23672366
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);
23692368
if (in_dev && (dev->flags & IFF_UP)) {
2370-
struct in_ifaddr * ifa;
2369+
struct in_ifaddr *ifa;
23712370

23722371
int flag = scope;
23732372

@@ -2413,7 +2412,7 @@ static void init_loopback(struct net_device *dev)
24132412

24142413
static void addrconf_add_linklocal(struct inet6_dev *idev, const struct in6_addr *addr)
24152414
{
2416-
struct inet6_ifaddr * ifp;
2415+
struct inet6_ifaddr *ifp;
24172416
u32 addr_flags = IFA_F_PERMANENT;
24182417

24192418
#ifdef CONFIG_IPV6_OPTIMISTIC_DAD
@@ -2434,7 +2433,7 @@ static void addrconf_add_linklocal(struct inet6_dev *idev, const struct in6_addr
24342433
static void addrconf_dev_config(struct net_device *dev)
24352434
{
24362435
struct in6_addr addr;
2437-
struct inet6_dev * idev;
2436+
struct inet6_dev *idev;
24382437

24392438
ASSERT_RTNL();
24402439

@@ -2570,7 +2569,7 @@ static void addrconf_ip6_tnl_config(struct net_device *dev)
25702569
}
25712570

25722571
static int addrconf_notify(struct notifier_block *this, unsigned long event,
2573-
void * data)
2572+
void *data)
25742573
{
25752574
struct net_device *dev = (struct net_device *) data;
25762575
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)
37943793
return inet6_dump_addr(skb, cb, type);
37953794
}
37963795

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,
37983797
void *arg)
37993798
{
38003799
struct net *net = sock_net(in_skb->sk);

0 commit comments

Comments
 (0)