3 files changed, 9 insertions, 3 deletions

diff --git a/net/core/wireless.c b/net/core/wireless.c
index d17f1583ea3e..271ddb35b0b2 100644
--- a/net/core/wireless.c
+++ b/net/core/wireless.c
@@ -455,10 +455,15 @@ static inline struct iw_statistics *get_wireless_stats(struct net_device *dev)
 
         /* Old location, field to be removed in next WE */
         if(dev->get_wireless_stats) {
-                printk(KERN_DEBUG "%s (WE) : Driver using old /proc/net/wireless support, please fix driver !\n",
-                       dev->name);
+                static int printed_message;
+
+                if (!printed_message++)
+                        printk(KERN_DEBUG "%s (WE) : Driver using old /proc/net/wireless support, please fix driver !\n",
+                                dev->name);
+
                 return dev->get_wireless_stats(dev);
         }
+
         /* Not found */
         return (struct iw_statistics *) NULL;
 }
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 677419d0c9ad..3e98b57578dc 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -2239,6 +2239,7 @@ static int tcp_ack_update_window(struct sock *sk, struct tcp_sock *tp,
                         /* Note, it is the only place, where
                          * fast path is recovered for sending TCP.
                          */
+                        tp->pred_flags = 0;
                         tcp_fast_path_check(sk, tp);
 
                         if (nwin > tp->max_window) {
diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c
index 30ec3efc48a6..691dea4a58e7 100644
--- a/net/sunrpc/svcsock.c
+++ b/net/sunrpc/svcsock.c
@@ -587,7 +587,7 @@ svc_udp_recvfrom(struct svc_rqst *rqstp)
                 struct timeval tv;
 
                 tv.tv_sec = xtime.tv_sec;
-                tv.tv_usec = xtime.tv_nsec * 1000;
+                tv.tv_usec = xtime.tv_nsec / NSEC_PER_USEC;
                 skb_set_timestamp(skb, &tv);
                 /* Don't enable netstamp, sunrpc doesn't 
                    need that much accuracy */