Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:

	drivers/net/e1000e/ich8lan.c

9 files changed, 69 insertions, 101 deletions

diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index 96fb0519eb7a..755414cd49d1 100644
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -134,9 +134,11 @@ static int poll_one_napi(struct netpoll_info *npinfo,
 
         npinfo->rx_flags |= NETPOLL_RX_DROP;
         atomic_inc(&trapped);
+        set_bit(NAPI_STATE_NPSVC, &napi->state);
 
         work = napi->poll(napi, budget);
 
+        clear_bit(NAPI_STATE_NPSVC, &napi->state);
         atomic_dec(&trapped);
         npinfo->rx_flags &= ~NETPOLL_RX_DROP;
 
diff --git a/net/ipv4/netfilter/nf_nat_rule.c b/net/ipv4/netfilter/nf_nat_rule.c
index cf95469ab9f1..a7eb04719044 100644
--- a/net/ipv4/netfilter/nf_nat_rule.c
+++ b/net/ipv4/netfilter/nf_nat_rule.c
@@ -61,7 +61,7 @@ static struct
 static struct xt_table nat_table = {
         .name           = "nat",
         .valid_hooks    = NAT_VALID_HOOKS,
-        .lock           = __RW_LOCK_UNLOCKED(__nat_table.lock),
+        .lock           = __RW_LOCK_UNLOCKED(nat_table.lock),
         .me             = THIS_MODULE,
         .af             = AF_INET,
 };
diff --git a/net/ipv4/tcp_vegas.c b/net/ipv4/tcp_vegas.c
index 7cd22262de3a..a453aac91bd3 100644
--- a/net/ipv4/tcp_vegas.c
+++ b/net/ipv4/tcp_vegas.c
@@ -40,18 +40,14 @@
 
 #include "tcp_vegas.h"
 
-/* Default values of the Vegas variables, in fixed-point representation
- * with V_PARAM_SHIFT bits to the right of the binary point.
- */
-#define V_PARAM_SHIFT 1
-static int alpha = 2<<V_PARAM_SHIFT;
-static int beta  = 4<<V_PARAM_SHIFT;
-static int gamma = 1<<V_PARAM_SHIFT;
+static int alpha = 2;
+static int beta  = 4;
+static int gamma = 1;
 
 module_param(alpha, int, 0644);
-MODULE_PARM_DESC(alpha, "lower bound of packets in network (scale by 2)");
+MODULE_PARM_DESC(alpha, "lower bound of packets in network");
 module_param(beta, int, 0644);
-MODULE_PARM_DESC(beta, "upper bound of packets in network (scale by 2)");
+MODULE_PARM_DESC(beta, "upper bound of packets in network");
 module_param(gamma, int, 0644);
 MODULE_PARM_DESC(gamma, "limit on increase (scale by 2)");
 
@@ -172,49 +168,13 @@ static void tcp_vegas_cong_avoid(struct sock *sk, u32 ack, u32 in_flight)
                 return;
         }
 
-        /* The key players are v_beg_snd_una and v_beg_snd_nxt.
-         *
-         * These are so named because they represent the approximate values
-         * of snd_una and snd_nxt at the beginning of the current RTT. More
-         * precisely, they represent the amount of data sent during the RTT.
-         * At the end of the RTT, when we receive an ACK for v_beg_snd_nxt,
-         * we will calculate that (v_beg_snd_nxt - v_beg_snd_una) outstanding
-         * bytes of data have been ACKed during the course of the RTT, giving
-         * an "actual" rate of:
-         *
-         *     (v_beg_snd_nxt - v_beg_snd_una) / (rtt duration)
-         *
-         * Unfortunately, v_beg_snd_una is not exactly equal to snd_una,
-         * because delayed ACKs can cover more than one segment, so they
-         * don't line up nicely with the boundaries of RTTs.
-         *
-         * Another unfortunate fact of life is that delayed ACKs delay the
-         * advance of the left edge of our send window, so that the number
-         * of bytes we send in an RTT is often less than our cwnd will allow.
-         * So we keep track of our cwnd separately, in v_beg_snd_cwnd.
-         */
-
         if (after(ack, vegas->beg_snd_nxt)) {
                 /* Do the Vegas once-per-RTT cwnd adjustment. */
-                u32 old_wnd, old_snd_cwnd;
-
-
-                /* Here old_wnd is essentially the window of data that was
-                 * sent during the previous RTT, and has all
-                 * been acknowledged in the course of the RTT that ended
-                 * with the ACK we just received. Likewise, old_snd_cwnd
-                 * is the cwnd during the previous RTT.
-                 */
-                old_wnd = (vegas->beg_snd_nxt - vegas->beg_snd_una) /
-                        tp->mss_cache;
-                old_snd_cwnd = vegas->beg_snd_cwnd;
 
                 /* Save the extent of the current window so we can use this
                  * at the end of the next RTT.
                  */
-                vegas->beg_snd_una  = vegas->beg_snd_nxt;
                 vegas->beg_snd_nxt  = tp->snd_nxt;
-                vegas->beg_snd_cwnd = tp->snd_cwnd;
 
                 /* We do the Vegas calculations only if we got enough RTT
                  * samples that we can be reasonably sure that we got
@@ -252,22 +212,14 @@ static void tcp_vegas_cong_avoid(struct sock *sk, u32 ack, u32 in_flight)
                          *
                          * This is:
                          *     (actual rate in segments) * baseRTT
-                         * We keep it as a fixed point number with
-                         * V_PARAM_SHIFT bits to the right of the binary point.
                          */
-                        target_cwnd = ((u64)old_wnd * vegas->baseRTT);
-                        target_cwnd <<= V_PARAM_SHIFT;
-                        do_div(target_cwnd, rtt);
+                        target_cwnd = tp->snd_cwnd * vegas->baseRTT / rtt;
 
                         /* Calculate the difference between the window we had,
                          * and the window we would like to have. This quantity
                          * is the "Diff" from the Arizona Vegas papers.
-                         *
-                         * Again, this is a fixed point number with
-                         * V_PARAM_SHIFT bits to the right of the binary
-                         * point.
                          */
-                        diff = (old_wnd << V_PARAM_SHIFT) - target_cwnd;
+                        diff = tp->snd_cwnd * (rtt-vegas->baseRTT) / vegas->baseRTT;
 
                         if (diff > gamma && tp->snd_ssthresh > 2 ) {
                                 /* Going too fast. Time to slow down
@@ -282,16 +234,13 @@ static void tcp_vegas_cong_avoid(struct sock *sk, u32 ack, u32 in_flight)
                                  * truncation robs us of full link
                                  * utilization.
                                  */
-                                tp->snd_cwnd = min(tp->snd_cwnd,
-                                                   ((u32)target_cwnd >>
-                                                    V_PARAM_SHIFT)+1);
+                                tp->snd_cwnd = min(tp->snd_cwnd, (u32)target_cwnd+1);
 
                         } else if (tp->snd_cwnd <= tp->snd_ssthresh) {
                                 /* Slow start.  */
                                 tcp_slow_start(tp);
                         } else {
                                 /* Congestion avoidance. */
-                                u32 next_snd_cwnd;
 
                                 /* Figure out where we would like cwnd
                                  * to be.
@@ -300,26 +249,17 @@ static void tcp_vegas_cong_avoid(struct sock *sk, u32 ack, u32 in_flight)
                                         /* The old window was too fast, so
                                          * we slow down.
                                          */
-                                        next_snd_cwnd = old_snd_cwnd - 1;
+                                        tp->snd_cwnd--;
                                 } else if (diff < alpha) {
                                         /* We don't have enough extra packets
                                          * in the network, so speed up.
                                          */
-                                        next_snd_cwnd = old_snd_cwnd + 1;
+                                        tp->snd_cwnd++;
                                 } else {
                                         /* Sending just as fast as we
                                          * should be.
                                          */
-                                        next_snd_cwnd = old_snd_cwnd;
                                 }
-
-                                /* Adjust cwnd upward or downward, toward the
-                                 * desired value.
-                                 */
-                                if (next_snd_cwnd > tp->snd_cwnd)
-                                        tp->snd_cwnd++;
-                                else if (next_snd_cwnd < tp->snd_cwnd)
-                                        tp->snd_cwnd--;
                         }
 
                         if (tp->snd_cwnd < 2)
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
index e4acc212345e..3e2970841bd8 100644
--- a/net/ipv6/ndisc.c
+++ b/net/ipv6/ndisc.c
@@ -947,8 +947,13 @@ static void ndisc_recv_na(struct sk_buff *skb)
                    is invalid, but ndisc specs say nothing
                    about it. It could be misconfiguration, or
                    an smart proxy agent tries to help us :-)
+
+                   We should not print the error if NA has been
+                   received from loopback - it is just our own
+                   unsolicited advertisement.
                  */
-                ND_PRINTK1(KERN_WARNING
+                if (skb->pkt_type != PACKET_LOOPBACK)
+                        ND_PRINTK1(KERN_WARNING
                            "ICMPv6 NA: someone advertises our address on %s!\n",
                            ifp->idev->dev->name);
                 in6_ifa_put(ifp);
diff --git a/net/netfilter/xt_socket.c b/net/netfilter/xt_socket.c
index 02a8fed21082..1acc089be7e9 100644
--- a/net/netfilter/xt_socket.c
+++ b/net/netfilter/xt_socket.c
@@ -141,7 +141,7 @@ socket_mt(const struct sk_buff *skb, const struct xt_match_param *par)
         sk = nf_tproxy_get_sock_v4(dev_net(skb->dev), protocol,
                                    saddr, daddr, sport, dport, par->in, false);
         if (sk != NULL) {
-                bool wildcard = (inet_sk(sk)->rcv_saddr == 0);
+                bool wildcard = (sk->sk_state != TCP_TIME_WAIT && inet_sk(sk)->rcv_saddr == 0);
 
                 nf_tproxy_put_sock(sk);
                 if (wildcard)
diff --git a/net/netlabel/netlabel_unlabeled.c b/net/netlabel/netlabel_unlabeled.c
index 90c8506a0aac..8c0308032178 100644
--- a/net/netlabel/netlabel_unlabeled.c
+++ b/net/netlabel/netlabel_unlabeled.c
@@ -562,7 +562,6 @@ static int netlbl_unlhsh_remove_addr4(struct net *net,
                                       const struct in_addr *mask,
                                       struct netlbl_audit *audit_info)
 {
-        int ret_val = 0;
         struct netlbl_af4list *list_entry;
         struct netlbl_unlhsh_addr4 *entry;
         struct audit_buffer *audit_buf;
@@ -577,7 +576,7 @@ static int netlbl_unlhsh_remove_addr4(struct net *net,
         if (list_entry != NULL)
                 entry = netlbl_unlhsh_addr4_entry(list_entry);
         else
-                ret_val = -ENOENT;
+                entry = NULL;
 
         audit_buf = netlbl_audit_start_common(AUDIT_MAC_UNLBL_STCDEL,
                                               audit_info);
@@ -588,19 +587,21 @@ static int netlbl_unlhsh_remove_addr4(struct net *net,
                                           addr->s_addr, mask->s_addr);
                 if (dev != NULL)
                         dev_put(dev);
-                if (entry && security_secid_to_secctx(entry->secid,
-                                                      &secctx,
-                                                      &secctx_len) == 0) {
+                if (entry != NULL &&
+                    security_secid_to_secctx(entry->secid,
+                                             &secctx, &secctx_len) == 0) {
                         audit_log_format(audit_buf, " sec_obj=%s", secctx);
                         security_release_secctx(secctx, secctx_len);
                 }
-                audit_log_format(audit_buf, " res=%u", ret_val == 0 ? 1 : 0);
+                audit_log_format(audit_buf, " res=%u", entry != NULL ? 1 : 0);
                 audit_log_end(audit_buf);
         }
 
-        if (ret_val == 0)
-                call_rcu(&entry->rcu, netlbl_unlhsh_free_addr4);
-        return ret_val;
+        if (entry == NULL)
+                return -ENOENT;
+
+        call_rcu(&entry->rcu, netlbl_unlhsh_free_addr4);
+        return 0;
 }
 
 #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
@@ -624,7 +625,6 @@ static int netlbl_unlhsh_remove_addr6(struct net *net,
                                       const struct in6_addr *mask,
                                       struct netlbl_audit *audit_info)
 {
-        int ret_val = 0;
         struct netlbl_af6list *list_entry;
         struct netlbl_unlhsh_addr6 *entry;
         struct audit_buffer *audit_buf;
@@ -638,7 +638,7 @@ static int netlbl_unlhsh_remove_addr6(struct net *net,
         if (list_entry != NULL)
                 entry = netlbl_unlhsh_addr6_entry(list_entry);
         else
-                ret_val = -ENOENT;
+                entry = NULL;
 
         audit_buf = netlbl_audit_start_common(AUDIT_MAC_UNLBL_STCDEL,
                                               audit_info);
@@ -649,19 +649,21 @@ static int netlbl_unlhsh_remove_addr6(struct net *net,
                                           addr, mask);
                 if (dev != NULL)
                         dev_put(dev);
-                if (entry && security_secid_to_secctx(entry->secid,
-                                                      &secctx,
-                                                      &secctx_len) == 0) {
+                if (entry != NULL &&
+                    security_secid_to_secctx(entry->secid,
+                                             &secctx, &secctx_len) == 0) {
                         audit_log_format(audit_buf, " sec_obj=%s", secctx);
                         security_release_secctx(secctx, secctx_len);
                 }
-                audit_log_format(audit_buf, " res=%u", ret_val == 0 ? 1 : 0);
+                audit_log_format(audit_buf, " res=%u", entry != NULL ? 1 : 0);
                 audit_log_end(audit_buf);
         }
 
-        if (ret_val == 0)
-                call_rcu(&entry->rcu, netlbl_unlhsh_free_addr6);
-        return ret_val;
+        if (entry == NULL)
+                return -ENOENT;
+
+        call_rcu(&entry->rcu, netlbl_unlhsh_free_addr6);
+        return 0;
 }
 #endif /* IPv6 */
 
diff --git a/net/phonet/pep-gprs.c b/net/phonet/pep-gprs.c
index e6e8e44852e5..22848dd7d67a 100644
--- a/net/phonet/pep-gprs.c
+++ b/net/phonet/pep-gprs.c
@@ -155,12 +155,13 @@ static void gprs_data_ready(struct sock *sk, int len)
 static void gprs_write_space(struct sock *sk)
 {
         struct gprs_dev *dev = sk->sk_user_data;
+        struct net_device *net = dev->net;
         unsigned credits = pep_writeable(sk);
 
         spin_lock_bh(&dev->tx_lock);
         dev->tx_max = credits;
-        if (credits > skb_queue_len(&dev->tx_queue))
-                netif_wake_queue(dev->net);
+        if (credits > skb_queue_len(&dev->tx_queue) && netif_running(net))
+                netif_wake_queue(net);
         spin_unlock_bh(&dev->tx_lock);
 }
 
@@ -168,6 +169,23 @@ static void gprs_write_space(struct sock *sk)
  * Network device callbacks
  */
 
+static int gprs_open(struct net_device *dev)
+{
+        struct gprs_dev *gp = netdev_priv(dev);
+
+        gprs_write_space(gp->sk);
+        return 0;
+}
+
+static int gprs_close(struct net_device *dev)
+{
+        struct gprs_dev *gp = netdev_priv(dev);
+
+        netif_stop_queue(dev);
+        flush_work(&gp->tx_work);
+        return 0;
+}
+
 static int gprs_xmit(struct sk_buff *skb, struct net_device *net)
 {
         struct gprs_dev *dev = netdev_priv(net);
@@ -248,6 +266,8 @@ static void gprs_setup(struct net_device *net)
         net->tx_queue_len       = 10;
 
         net->destructor         = free_netdev;
+        net->open               = gprs_open;
+        net->stop               = gprs_close;
         net->hard_start_xmit    = gprs_xmit; /* mandatory */
         net->change_mtu         = gprs_set_mtu;
 }
@@ -311,7 +331,6 @@ int gprs_attach(struct sock *sk)
         dev->sk = sk;
 
         printk(KERN_DEBUG"%s: attached\n", net->name);
-        gprs_write_space(sk); /* kick off TX */
         return net->ifindex;
 
 out_rel:
@@ -334,7 +353,5 @@ void gprs_detach(struct sock *sk)
 
         printk(KERN_DEBUG"%s: detached\n", net->name);
         unregister_netdev(net);
-        flush_scheduled_work();
         sock_put(sk);
-        skb_queue_purge(&dev->tx_queue);
 }
diff --git a/net/sched/sch_netem.c b/net/sched/sch_netem.c
index f840d6b27c65..7e78f1c0f357 100644
--- a/net/sched/sch_netem.c
+++ b/net/sched/sch_netem.c
@@ -46,9 +46,6 @@
          layering other disciplines.  It does not need to do bandwidth
          control either since that can be handled by using token
          bucket or other rate control.
-
-         The simulator is limited by the Linux timer resolution
-         and will create packet bursts on the HZ boundary (1ms).
 */
 
 struct netem_sched_data {
diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c
index 6f7d1f2d2f36..ef3238d665ee 100644
--- a/net/sunrpc/svcsock.c
+++ b/net/sunrpc/svcsock.c
@@ -1183,7 +1183,11 @@ int svc_addsock(struct svc_serv *serv,
         else if (so->state > SS_UNCONNECTED)
                 err = -EISCONN;
         else {
-                svsk = svc_setup_socket(serv, so, &err, SVC_SOCK_DEFAULTS);
+                if (!try_module_get(THIS_MODULE))
+                        err = -ENOENT;
+                else
+                        svsk = svc_setup_socket(serv, so, &err,
+                                                SVC_SOCK_DEFAULTS);
                 if (svsk) {
                         struct sockaddr_storage addr;
                         struct sockaddr *sin = (struct sockaddr *)&addr;
@@ -1196,7 +1200,8 @@ int svc_addsock(struct svc_serv *serv,
                         spin_unlock_bh(&serv->sv_lock);
                         svc_xprt_received(&svsk->sk_xprt);
                         err = 0;
-                }
+                } else
+                        module_put(THIS_MODULE);
         }
         if (err) {
                 sockfd_put(so);