14 files changed, 28 insertions, 42 deletions

diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
index 7635d3f72723..4e7b847347f7 100644
--- a/net/core/net-sysfs.c
+++ b/net/core/net-sysfs.c
@@ -87,6 +87,7 @@ static ssize_t netdev_store(struct device *dev, struct device_attribute *attr,
         return ret;
 }
 
+NETDEVICE_SHOW(dev_id, fmt_hex);
 NETDEVICE_SHOW(addr_len, fmt_dec);
 NETDEVICE_SHOW(iflink, fmt_dec);
 NETDEVICE_SHOW(ifindex, fmt_dec);
@@ -210,6 +211,7 @@ static ssize_t store_tx_queue_len(struct device *dev,
 
 static struct device_attribute net_class_attributes[] = {
         __ATTR(addr_len, S_IRUGO, show_addr_len, NULL),
+        __ATTR(dev_id, S_IRUGO, show_dev_id, NULL),
         __ATTR(iflink, S_IRUGO, show_iflink, NULL),
         __ATTR(ifindex, S_IRUGO, show_ifindex, NULL),
         __ATTR(features, S_IRUGO, show_features, NULL),
diff --git a/net/dccp/probe.c b/net/dccp/probe.c
index 7053bb827bc8..6e1df62bd7c9 100644
--- a/net/dccp/probe.c
+++ b/net/dccp/probe.c
@@ -46,29 +46,24 @@ struct {
         struct kfifo      *fifo;
         spinlock_t        lock;
         wait_queue_head_t wait;
-        struct timeval    tstart;
+        struct timespec   tstart;
 } dccpw;
 
 static void printl(const char *fmt, ...)
 {
         va_list args;
         int len;
-        struct timeval now;
+        struct timespec now;
         char tbuf[256];
 
         va_start(args, fmt);
-        do_gettimeofday(&now);
+        getnstimeofday(&now);
 
-        now.tv_sec -= dccpw.tstart.tv_sec;
-        now.tv_usec -= dccpw.tstart.tv_usec;
-        if (now.tv_usec < 0) {
-                --now.tv_sec;
-                now.tv_usec += 1000000;
-        }
+        now = timespec_sub(now, dccpw.tstart);
 
         len = sprintf(tbuf, "%lu.%06lu ",
                       (unsigned long) now.tv_sec,
-                      (unsigned long) now.tv_usec);
+                      (unsigned long) now.tv_nsec / NSEC_PER_USEC);
         len += vscnprintf(tbuf+len, sizeof(tbuf)-len, fmt, args);
         va_end(args);
 
@@ -119,7 +114,7 @@ static struct jprobe dccp_send_probe = {
 static int dccpprobe_open(struct inode *inode, struct file *file)
 {
         kfifo_reset(dccpw.fifo);
-        do_gettimeofday(&dccpw.tstart);
+        getnstimeofday(&dccpw.tstart);
         return 0;
 }
 
diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c
index f064031f2031..c67d00e8c600 100644
--- a/net/ipv4/icmp.c
+++ b/net/ipv4/icmp.c
@@ -847,7 +847,7 @@ static void icmp_echo(struct sk_buff *skb)
  */
 static void icmp_timestamp(struct sk_buff *skb)
 {
-        struct timeval tv;
+        struct timespec tv;
         struct icmp_bxm icmp_param;
         /*
          *      Too short.
@@ -858,9 +858,9 @@ static void icmp_timestamp(struct sk_buff *skb)
         /*
          *      Fill in the current time as ms since midnight UT:
          */
-        do_gettimeofday(&tv);
-        icmp_param.data.times[1] = htonl((tv.tv_sec % 86400) * 1000 +
-                                         tv.tv_usec / 1000);
+        getnstimeofday(&tv);
+        icmp_param.data.times[1] = htonl((tv.tv_sec % 86400) * MSEC_PER_SEC +
+                                         tv.tv_nsec / NSEC_PER_MSEC);
         icmp_param.data.times[2] = icmp_param.data.times[1];
         if (skb_copy_bits(skb, 0, &icmp_param.data.times[0], 4))
                 BUG();
@@ -1144,7 +1144,7 @@ static void __net_exit icmp_sk_exit(struct net *net)
         net->ipv4.icmp_sk = NULL;
 }
 
-int __net_init icmp_sk_init(struct net *net)
+static int __net_init icmp_sk_init(struct net *net)
 {
         int i, err;
 
diff --git a/net/ipv4/ip_options.c b/net/ipv4/ip_options.c
index d107543d3f81..33126ad2cfdc 100644
--- a/net/ipv4/ip_options.c
+++ b/net/ipv4/ip_options.c
@@ -55,10 +55,10 @@ void ip_options_build(struct sk_buff * skb, struct ip_options * opt,
                 if (opt->ts_needaddr)
                         ip_rt_get_source(iph+opt->ts+iph[opt->ts+2]-9, rt);
                 if (opt->ts_needtime) {
-                        struct timeval tv;
+                        struct timespec tv;
                         __be32 midtime;
-                        do_gettimeofday(&tv);
-                        midtime = htonl((tv.tv_sec % 86400) * 1000 + tv.tv_usec / 1000);
+                        getnstimeofday(&tv);
+                        midtime = htonl((tv.tv_sec % 86400) * MSEC_PER_SEC + tv.tv_nsec / NSEC_PER_MSEC);
                         memcpy(iph+opt->ts+iph[opt->ts+2]-5, &midtime, 4);
                 }
                 return;
@@ -406,10 +406,10 @@ int ip_options_compile(struct net *net,
                                         break;
                                 }
                                 if (timeptr) {
-                                        struct timeval tv;
+                                        struct timespec tv;
                                         __be32  midtime;
-                                        do_gettimeofday(&tv);
-                                        midtime = htonl((tv.tv_sec % 86400) * 1000 + tv.tv_usec / 1000);
+                                        getnstimeofday(&tv);
+                                        midtime = htonl((tv.tv_sec % 86400) * MSEC_PER_SEC + tv.tv_nsec / NSEC_PER_MSEC);
                                         memcpy(timeptr, &midtime, sizeof(__be32));
                                         opt->is_changed = 1;
                                 }
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 58ac838bf460..f88653138621 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -1722,7 +1722,7 @@ static int tcp_close_state(struct sock *sk)
 
 /*
  *      Shutdown the sending side of a connection. Much like close except
- *      that we don't receive shut down or set_sock_flag(sk, SOCK_DEAD).
+ *      that we don't receive shut down or sock_set_flag(sk, SOCK_DEAD).
  */
 
 void tcp_shutdown(struct sock *sk, int how)
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index cdc051bfdb4d..ac9b8482f702 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -2298,7 +2298,7 @@ static inline int tcp_packet_delayed(struct tcp_sock *tp)
 {
         return !tp->retrans_stamp ||
                 (tp->rx_opt.saw_tstamp && tp->rx_opt.rcv_tsecr &&
-                 (__s32)(tp->rx_opt.rcv_tsecr - tp->retrans_stamp) < 0);
+                 before(tp->rx_opt.rcv_tsecr, tp->retrans_stamp));
 }
 
 /* Undo procedures. */
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 8a0fd4007bdb..e591e09e5e4e 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -4338,12 +4338,6 @@ int unregister_inet6addr_notifier(struct notifier_block *nb)
 
 EXPORT_SYMBOL(unregister_inet6addr_notifier);
 
-
-static int addrconf_net_init(struct net *net)
-{
-        return 0;
-}
-
 static void addrconf_net_exit(struct net *net)
 {
         struct net_device *dev;
@@ -4360,7 +4354,6 @@ static void addrconf_net_exit(struct net *net)
 }
 
 static struct pernet_operations addrconf_net_ops = {
-        .init = addrconf_net_init,
         .exit = addrconf_net_exit,
 };
 
diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c
index 50f3f8f8a59b..1ee4fa17c129 100644
--- a/net/ipv6/ip6_fib.c
+++ b/net/ipv6/ip6_fib.c
@@ -1543,7 +1543,7 @@ out_timer:
 static void fib6_net_exit(struct net *net)
 {
         rt6_ifdown(net, NULL);
-        del_timer(net->ipv6.ip6_fib_timer);
+        del_timer_sync(net->ipv6.ip6_fib_timer);
         kfree(net->ipv6.ip6_fib_timer);
 #ifdef CONFIG_IPV6_MULTIPLE_TABLES
         kfree(net->ipv6.fib6_local_tbl);
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 210a079cfc6f..a493ad9b8914 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -150,7 +150,7 @@ static struct rt6_info ip6_null_entry_template = {
 static int ip6_pkt_prohibit(struct sk_buff *skb);
 static int ip6_pkt_prohibit_out(struct sk_buff *skb);
 
-struct rt6_info ip6_prohibit_entry_template = {
+static struct rt6_info ip6_prohibit_entry_template = {
         .u = {
                 .dst = {
                         .__refcnt       = ATOMIC_INIT(1),
@@ -2614,9 +2614,8 @@ struct ctl_table *ipv6_route_sysctl_init(struct net *net)
 
 static int ip6_route_net_init(struct net *net)
 {
-        int ret = 0;
+        int ret = -ENOMEM;
 
-        ret = -ENOMEM;
         net->ipv6.ip6_dst_ops = kmemdup(&ip6_dst_ops_template,
                                         sizeof(*net->ipv6.ip6_dst_ops),
                                         GFP_KERNEL);
diff --git a/net/key/af_key.c b/net/key/af_key.c
index 1fb0fe42a72e..81a8e5297ad1 100644
--- a/net/key/af_key.c
+++ b/net/key/af_key.c
@@ -1907,7 +1907,7 @@ parse_ipsecrequest(struct xfrm_policy *xp, struct sadb_x_ipsecrequest *rq)
                 t->encap_family = xp->family;
 
         /* No way to set this via kame pfkey */
-        t->aalgos = t->ealgos = t->calgos = ~0;
+        t->allalgs = 1;
         xp->xfrm_nr++;
         return 0;
 }
diff --git a/net/rose/rose_route.c b/net/rose/rose_route.c
index fb9359fb2358..5053a53ba24f 100644
--- a/net/rose/rose_route.c
+++ b/net/rose/rose_route.c
@@ -857,7 +857,6 @@ int rose_route_frame(struct sk_buff *skb, ax25_cb *ax25)
         src_addr  = (rose_address *)(skb->data + 9);
         dest_addr = (rose_address *)(skb->data + 4);
 
-        spin_lock_bh(&rose_node_list_lock);
         spin_lock_bh(&rose_neigh_list_lock);
         spin_lock_bh(&rose_route_list_lock);
 
@@ -1060,7 +1059,6 @@ int rose_route_frame(struct sk_buff *skb, ax25_cb *ax25)
 out:
         spin_unlock_bh(&rose_route_list_lock);
         spin_unlock_bh(&rose_neigh_list_lock);
-        spin_unlock_bh(&rose_node_list_lock);
 
         return res;
 }
diff --git a/net/socket.c b/net/socket.c
index 9b5c917f8a6b..66c4a8cf6db9 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -2327,9 +2327,6 @@ int kernel_sock_shutdown(struct socket *sock, enum sock_shutdown_cmd how)
         return sock->ops->shutdown(sock, how);
 }
 
-/* ABI emulation layers need these two */
-EXPORT_SYMBOL(move_addr_to_kernel);
-EXPORT_SYMBOL(move_addr_to_user);
 EXPORT_SYMBOL(sock_create);
 EXPORT_SYMBOL(sock_create_kern);
 EXPORT_SYMBOL(sock_create_lite);
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index ab4d0e598a2c..e0c0390613c0 100644
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -1819,7 +1819,7 @@ xfrm_state_ok(struct xfrm_tmpl *tmpl, struct xfrm_state *x,
                 (x->id.spi == tmpl->id.spi || !tmpl->id.spi) &&
                 (x->props.reqid == tmpl->reqid || !tmpl->reqid) &&
                 x->props.mode == tmpl->mode &&
-                ((tmpl->aalgos & (1<<x->props.aalgo)) ||
+                (tmpl->allalgs || (tmpl->aalgos & (1<<x->props.aalgo)) ||
                  !(xfrm_id_proto_match(tmpl->id.proto, IPSEC_PROTO_ANY))) &&
                 !(x->props.mode != XFRM_MODE_TRANSPORT &&
                   xfrm_state_addr_cmp(tmpl, x, family));
diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
index 1810f5645bb5..22a30ae582a2 100644
--- a/net/xfrm/xfrm_user.c
+++ b/net/xfrm/xfrm_user.c
@@ -981,6 +981,8 @@ static void copy_templates(struct xfrm_policy *xp, struct xfrm_user_tmpl *ut,
                 t->aalgos = ut->aalgos;
                 t->ealgos = ut->ealgos;
                 t->calgos = ut->calgos;
+                /* If all masks are ~0, then we allow all algorithms. */
+                t->allalgs = !~(t->aalgos & t->ealgos & t->calgos);
                 t->encap_family = ut->family;
         }
 }