diff options
author | Stephen Hemminger <shemminger@vyatta.com> | 2008-01-21 03:48:43 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 18:08:37 -0500 |
commit | d20b3109e9d122460929c50b857fcde251706ece (patch) | |
tree | 9f500808c0c07cc7c59eba3afa13a8a25109a3a9 /net/ipv6/addrconf.c | |
parent | 13a0a096e58a1149a8cffbd7722b820044e3801e (diff) |
[IPV6]: addrconf sparse warnings
Get rid of a couple of sparse warnings in IPV6 addrconf code.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/addrconf.c')
-rw-r--r-- | net/ipv6/addrconf.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 803caf1a3890..aba7b5d52a9f 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c | |||
@@ -1900,7 +1900,7 @@ int addrconf_set_dstaddr(void __user *arg) | |||
1900 | p.iph.ihl = 5; | 1900 | p.iph.ihl = 5; |
1901 | p.iph.protocol = IPPROTO_IPV6; | 1901 | p.iph.protocol = IPPROTO_IPV6; |
1902 | p.iph.ttl = 64; | 1902 | p.iph.ttl = 64; |
1903 | ifr.ifr_ifru.ifru_data = (void __user *)&p; | 1903 | ifr.ifr_ifru.ifru_data = (__force void __user *)&p; |
1904 | 1904 | ||
1905 | oldfs = get_fs(); set_fs(KERNEL_DS); | 1905 | oldfs = get_fs(); set_fs(KERNEL_DS); |
1906 | err = dev->do_ioctl(dev, &ifr, SIOCADDTUNNEL); | 1906 | err = dev->do_ioctl(dev, &ifr, SIOCADDTUNNEL); |
@@ -2799,6 +2799,7 @@ static struct inet6_ifaddr *if6_get_idx(struct seq_file *seq, loff_t pos) | |||
2799 | } | 2799 | } |
2800 | 2800 | ||
2801 | static void *if6_seq_start(struct seq_file *seq, loff_t *pos) | 2801 | static void *if6_seq_start(struct seq_file *seq, loff_t *pos) |
2802 | __acquires(addrconf_hash_lock) | ||
2802 | { | 2803 | { |
2803 | read_lock_bh(&addrconf_hash_lock); | 2804 | read_lock_bh(&addrconf_hash_lock); |
2804 | return if6_get_idx(seq, *pos); | 2805 | return if6_get_idx(seq, *pos); |
@@ -2814,6 +2815,7 @@ static void *if6_seq_next(struct seq_file *seq, void *v, loff_t *pos) | |||
2814 | } | 2815 | } |
2815 | 2816 | ||
2816 | static void if6_seq_stop(struct seq_file *seq, void *v) | 2817 | static void if6_seq_stop(struct seq_file *seq, void *v) |
2818 | __releases(addrconf_hash_lock) | ||
2817 | { | 2819 | { |
2818 | read_unlock_bh(&addrconf_hash_lock); | 2820 | read_unlock_bh(&addrconf_hash_lock); |
2819 | } | 2821 | } |