10 files changed, 35 insertions, 30 deletions

diff --git a/net/core/sock.c b/net/core/sock.c
index 1d55fbd22dfa..239a08a6ff24 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -171,6 +171,19 @@ static const char *af_family_slock_key_strings[AF_MAX+1] = {
   "slock-AF_TIPC"  , "slock-AF_BLUETOOTH", "slock-AF_IUCV"     ,
   "slock-AF_RXRPC" , "slock-AF_MAX"
 };
+static const char *af_family_clock_key_strings[AF_MAX+1] = {
+  "clock-AF_UNSPEC", "clock-AF_UNIX"     , "clock-AF_INET"     ,
+  "clock-AF_AX25"  , "clock-AF_IPX"      , "clock-AF_APPLETALK",
+  "clock-AF_NETROM", "clock-AF_BRIDGE"   , "clock-AF_ATMPVC"   ,
+  "clock-AF_X25"   , "clock-AF_INET6"    , "clock-AF_ROSE"     ,
+  "clock-AF_DECnet", "clock-AF_NETBEUI"  , "clock-AF_SECURITY" ,
+  "clock-AF_KEY"   , "clock-AF_NETLINK"  , "clock-AF_PACKET"   ,
+  "clock-AF_ASH"   , "clock-AF_ECONET"   , "clock-AF_ATMSVC"   ,
+  "clock-21"       , "clock-AF_SNA"      , "clock-AF_IRDA"     ,
+  "clock-AF_PPPOX" , "clock-AF_WANPIPE"  , "clock-AF_LLC"      ,
+  "clock-27"       , "clock-28"          , "clock-29"          ,
+  "clock-AF_TIPC"  , "clock-AF_BLUETOOTH", "clock-AF_MAX"
+};
 #endif
 
 /*
@@ -941,8 +954,9 @@ struct sock *sk_clone(const struct sock *sk, const gfp_t priority)
 
                 rwlock_init(&newsk->sk_dst_lock);
                 rwlock_init(&newsk->sk_callback_lock);
-                lockdep_set_class(&newsk->sk_callback_lock,
-                                   af_callback_keys + newsk->sk_family);
+                lockdep_set_class_and_name(&newsk->sk_callback_lock,
+                                af_callback_keys + newsk->sk_family,
+                                af_family_clock_key_strings[newsk->sk_family]);
 
                 newsk->sk_dst_cache     = NULL;
                 newsk->sk_wmem_queued   = 0;
@@ -1530,8 +1544,9 @@ void sock_init_data(struct socket *sock, struct sock *sk)
 
         rwlock_init(&sk->sk_dst_lock);
         rwlock_init(&sk->sk_callback_lock);
-        lockdep_set_class(&sk->sk_callback_lock,
-                           af_callback_keys + sk->sk_family);
+        lockdep_set_class_and_name(&sk->sk_callback_lock,
+                        af_callback_keys + sk->sk_family,
+                        af_family_clock_key_strings[sk->sk_family]);
 
         sk->sk_state_change     =       sock_def_wakeup;
         sk->sk_data_ready       =       sock_def_readable;
diff --git a/net/dccp/probe.c b/net/dccp/probe.c
index 43a3adb027e7..bae10b0f2fc3 100644
--- a/net/dccp/probe.c
+++ b/net/dccp/probe.c
@@ -112,7 +112,7 @@ static struct jprobe dccp_send_probe = {
         .kp     = {
                 .symbol_name = "dccp_sendmsg",
         },
-        .entry  = JPROBE_ENTRY(jdccp_sendmsg),
+        .entry  = jdccp_sendmsg,
 };
 
 static int dccpprobe_open(struct inode *inode, struct file *file)
diff --git a/net/ieee80211/ieee80211_wx.c b/net/ieee80211/ieee80211_wx.c
index 523a137d49dd..465b73d50532 100644
--- a/net/ieee80211/ieee80211_wx.c
+++ b/net/ieee80211/ieee80211_wx.c
@@ -90,14 +90,11 @@ static char *ieee80211_translate_scan(struct ieee80211_device *ieee,
         }
 
         /* Add channel and frequency */
+        /* Note : userspace automatically computes channel using iwrange */
         iwe.cmd = SIOCGIWFREQ;
-        iwe.u.freq.m = network->channel;
-        iwe.u.freq.e = 0;
-        iwe.u.freq.i = 0;
-        start = iwe_stream_add_event(start, stop, &iwe, IW_EV_FREQ_LEN);
-
         iwe.u.freq.m = ieee80211_channel_to_freq(ieee, network->channel);
         iwe.u.freq.e = 6;
+        iwe.u.freq.i = 0;
         start = iwe_stream_add_event(start, stop, &iwe, IW_EV_FREQ_LEN);
 
         /* Add encryption capability */
diff --git a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c
index 3da9d73d1b52..27c7918e442a 100644
--- a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c
+++ b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c
@@ -177,7 +177,7 @@ static int ct_open(struct inode *inode, struct file *file)
         struct ct_iter_state *st;
         int ret;
 
-        st = kmalloc(sizeof(struct ct_iter_state), GFP_KERNEL);
+        st = kzalloc(sizeof(struct ct_iter_state), GFP_KERNEL);
         if (st == NULL)
                 return -ENOMEM;
         ret = seq_open(file, &ct_seq_ops);
@@ -185,7 +185,6 @@ static int ct_open(struct inode *inode, struct file *file)
                 goto out_free;
         seq          = file->private_data;
         seq->private = st;
-        memset(st, 0, sizeof(struct ct_iter_state));
         return ret;
 out_free:
         kfree(st);
diff --git a/net/ipv4/tcp_probe.c b/net/ipv4/tcp_probe.c
index f37d5928921a..b76398d1b454 100644
--- a/net/ipv4/tcp_probe.c
+++ b/net/ipv4/tcp_probe.c
@@ -130,7 +130,7 @@ static struct jprobe tcp_jprobe = {
         .kp = {
                 .symbol_name    = "tcp_rcv_established",
         },
-        .entry  = JPROBE_ENTRY(jtcp_rcv_established),
+        .entry  = jtcp_rcv_established,
 };
 
 static int tcpprobe_open(struct inode * inode, struct file * file)
diff --git a/net/mac80211/ieee80211_rate.c b/net/mac80211/ieee80211_rate.c
index 16e850864b8a..2118de04fc35 100644
--- a/net/mac80211/ieee80211_rate.c
+++ b/net/mac80211/ieee80211_rate.c
@@ -24,11 +24,10 @@ int ieee80211_rate_control_register(struct rate_control_ops *ops)
 {
         struct rate_control_alg *alg;
 
-        alg = kmalloc(sizeof(*alg), GFP_KERNEL);
+        alg = kzalloc(sizeof(*alg), GFP_KERNEL);
         if (alg == NULL) {
                 return -ENOMEM;
         }
-        memset(alg, 0, sizeof(*alg));
         alg->ops = ops;
 
         mutex_lock(&rate_ctrl_mutex);
diff --git a/net/mac80211/ieee80211_sta.c b/net/mac80211/ieee80211_sta.c
index 952d8dd0676c..7ba352e3ffe0 100644
--- a/net/mac80211/ieee80211_sta.c
+++ b/net/mac80211/ieee80211_sta.c
@@ -1326,10 +1326,9 @@ ieee80211_rx_bss_add(struct net_device *dev, u8 *bssid)
         struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
         struct ieee80211_sta_bss *bss;
 
-        bss = kmalloc(sizeof(*bss), GFP_ATOMIC);
+        bss = kzalloc(sizeof(*bss), GFP_ATOMIC);
         if (!bss)
                 return NULL;
-        memset(bss, 0, sizeof(*bss));
         atomic_inc(&bss->users);
         atomic_inc(&bss->users);
         memcpy(bss->bssid, bssid, ETH_ALEN);
diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c
index f752293940f9..a4ce5e887997 100644
--- a/net/netfilter/nf_conntrack_standalone.c
+++ b/net/netfilter/nf_conntrack_standalone.c
@@ -198,7 +198,7 @@ static int ct_open(struct inode *inode, struct file *file)
         struct ct_iter_state *st;
         int ret;
 
-        st = kmalloc(sizeof(struct ct_iter_state), GFP_KERNEL);
+        st = kzalloc(sizeof(struct ct_iter_state), GFP_KERNEL);
         if (st == NULL)
                 return -ENOMEM;
         ret = seq_open(file, &ct_seq_ops);
@@ -206,7 +206,6 @@ static int ct_open(struct inode *inode, struct file *file)
                 goto out_free;
         seq          = file->private_data;
         seq->private = st;
-        memset(st, 0, sizeof(struct ct_iter_state));
         return ret;
 out_free:
         kfree(st);
diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c
index e787b6a43eee..5b2b6fb244f2 100644
--- a/net/sunrpc/rpc_pipe.c
+++ b/net/sunrpc/rpc_pipe.c
@@ -460,21 +460,19 @@ static struct dentry_operations rpc_dentry_operations = {
 static int
 rpc_lookup_parent(char *path, struct nameidata *nd)
 {
+        struct vfsmount *mnt;
+
         if (path[0] == '\0')
                 return -ENOENT;
-        nd->mnt = rpc_get_mount();
-        if (IS_ERR(nd->mnt)) {
+
+        mnt = rpc_get_mount();
+        if (IS_ERR(mnt)) {
                 printk(KERN_WARNING "%s: %s failed to mount "
                                "pseudofilesystem \n", __FILE__, __FUNCTION__);
-                return PTR_ERR(nd->mnt);
+                return PTR_ERR(mnt);
         }
-        mntget(nd->mnt);
-        nd->dentry = dget(rpc_mount->mnt_root);
-        nd->last_type = LAST_ROOT;
-        nd->flags = LOOKUP_PARENT;
-        nd->depth = 0;
 
-        if (path_walk(path, nd)) {
+        if (vfs_path_lookup(mnt->mnt_root, mnt, path, LOOKUP_PARENT, nd)) {
                 printk(KERN_WARNING "%s: %s failed to find path %s\n",
                                 __FILE__, __FUNCTION__, path);
                 rpc_put_mount();
diff --git a/net/tipc/name_table.c b/net/tipc/name_table.c
index 9dfc9127acdd..d8473eefcd23 100644
--- a/net/tipc/name_table.c
+++ b/net/tipc/name_table.c
@@ -1052,12 +1052,11 @@ int tipc_nametbl_init(void)
 {
         int array_size = sizeof(struct hlist_head) * tipc_nametbl_size;
 
-        table.types = kmalloc(array_size, GFP_ATOMIC);
+        table.types = kzalloc(array_size, GFP_ATOMIC);
         if (!table.types)
                 return -ENOMEM;
 
         write_lock_bh(&tipc_nametbl_lock);
-        memset(table.types, 0, array_size);
         table.local_publ_count = 0;
         write_unlock_bh(&tipc_nametbl_lock);
         return 0;