diff options
Diffstat (limited to 'net/decnet/dn_dev.c')
-rw-r--r-- | net/decnet/dn_dev.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/decnet/dn_dev.c b/net/decnet/dn_dev.c index daf2b98b15fe..1c6a5bb6f0c8 100644 --- a/net/decnet/dn_dev.c +++ b/net/decnet/dn_dev.c | |||
@@ -684,7 +684,6 @@ static int dn_nl_newaddr(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg) | |||
684 | return -ENODEV; | 684 | return -ENODEV; |
685 | 685 | ||
686 | if ((dn_db = dev->dn_ptr) == NULL) { | 686 | if ((dn_db = dev->dn_ptr) == NULL) { |
687 | int err; | ||
688 | dn_db = dn_dev_create(dev, &err); | 687 | dn_db = dn_dev_create(dev, &err); |
689 | if (!dn_db) | 688 | if (!dn_db) |
690 | return err; | 689 | return err; |
@@ -769,7 +768,8 @@ static void dn_ifaddr_notify(int event, struct dn_ifaddr *ifa) | |||
769 | kfree_skb(skb); | 768 | kfree_skb(skb); |
770 | goto errout; | 769 | goto errout; |
771 | } | 770 | } |
772 | err = rtnl_notify(skb, &init_net, 0, RTNLGRP_DECnet_IFADDR, NULL, GFP_KERNEL); | 771 | rtnl_notify(skb, &init_net, 0, RTNLGRP_DECnet_IFADDR, NULL, GFP_KERNEL); |
772 | return; | ||
773 | errout: | 773 | errout: |
774 | if (err < 0) | 774 | if (err < 0) |
775 | rtnl_set_sk_err(&init_net, RTNLGRP_DECnet_IFADDR, err); | 775 | rtnl_set_sk_err(&init_net, RTNLGRP_DECnet_IFADDR, err); |
@@ -1322,6 +1322,7 @@ static inline int is_dn_dev(struct net_device *dev) | |||
1322 | } | 1322 | } |
1323 | 1323 | ||
1324 | static void *dn_dev_seq_start(struct seq_file *seq, loff_t *pos) | 1324 | static void *dn_dev_seq_start(struct seq_file *seq, loff_t *pos) |
1325 | __acquires(&dev_base_lock) | ||
1325 | { | 1326 | { |
1326 | int i; | 1327 | int i; |
1327 | struct net_device *dev; | 1328 | struct net_device *dev; |
@@ -1364,6 +1365,7 @@ static void *dn_dev_seq_next(struct seq_file *seq, void *v, loff_t *pos) | |||
1364 | } | 1365 | } |
1365 | 1366 | ||
1366 | static void dn_dev_seq_stop(struct seq_file *seq, void *v) | 1367 | static void dn_dev_seq_stop(struct seq_file *seq, void *v) |
1368 | __releases(&dev_base_lock) | ||
1367 | { | 1369 | { |
1368 | read_unlock(&dev_base_lock); | 1370 | read_unlock(&dev_base_lock); |
1369 | } | 1371 | } |