Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  [libata] sata_via: fix obvious typo

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 9cb3ca5806fce75ff90ebc32db5f87ce8c231dd2..6e863aa9894c9ed4af4e89d9a56be08f3a00a541 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -2833,7 +2833,7 @@ config NET_FC
          "SCSI generic support".
 
 config SHAPER
-       tristate "Traffic Shaper (EXPERIMENTAL)"
+       tristate "Traffic Shaper (OBSOLETE)"
        depends on EXPERIMENTAL
        ---help---
          The traffic shaper is a virtual network device that allows you to
@@ -2842,9 +2842,9 @@ config SHAPER
          these virtual devices. See
          <file:Documentation/networking/shaper.txt> for more information.
 
-         An alternative to this traffic shaper is the experimental
-         Class-Based Queuing (CBQ) scheduling support which you get if you
-         say Y to "QoS and/or fair queuing" above.
+         An alternative to this traffic shaper are traffic schedulers which
+         you'll get if you say Y to "QoS and/or fair queuing" in
+         "Networking options".
 
          To compile this driver as a module, choose M here: the module
          will be called shaper.  If unsure, say N.

diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 8f059b7968bd71aba86ce4226cb0ee3e6e5d97de..06e4f77b0988c465356e365e5d1f0fd9ae8b4476 100644 (file)
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -10212,7 +10212,7 @@ skip_phy_reset:
 static void __devinit tg3_read_partno(struct tg3 *tp)
 {
        unsigned char vpd_data[256];
-       int i;
+       unsigned int i;
        u32 magic;
 
        if (tg3_nvram_read_swab(tp, 0x0, &magic))
@@ -10258,9 +10258,9 @@ static void __devinit tg3_read_partno(struct tg3 *tp)
        }
 
        /* Now parse and find the part number. */
-       for (i = 0; i < 256; ) {
+       for (i = 0; i < 254; ) {
                unsigned char val = vpd_data[i];
-               int block_end;
+               unsigned int block_end;
 
                if (val == 0x82 || val == 0x91) {
                        i = (i + 3 +
@@ -10276,21 +10276,26 @@ static void __devinit tg3_read_partno(struct tg3 *tp)
                             (vpd_data[i + 1] +
                              (vpd_data[i + 2] << 8)));
                i += 3;
-               while (i < block_end) {
+
+               if (block_end > 256)
+                       goto out_not_found;
+
+               while (i < (block_end - 2)) {
                        if (vpd_data[i + 0] == 'P' &&
                            vpd_data[i + 1] == 'N') {
                                int partno_len = vpd_data[i + 2];
 
-                               if (partno_len > 24)
+                               i += 3;
+                               if (partno_len > 24 || (partno_len + i) > 256)
                                        goto out_not_found;
 
                                memcpy(tp->board_part_number,
-                                      &vpd_data[i + 3],
-                                      partno_len);
+                                      &vpd_data[i], partno_len);
 
                                /* Success. */
                                return;
                        }
+                       i += 3 + vpd_data[i + 2];
                }
 
                /* Part number not found. */

diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index 9308af060b44d61284d6ce654b82029dbc0d6738..6589adb14cbfe5d80401b5384671a599bb05e1f4 100644 (file)
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -340,6 +340,12 @@ void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
        udph->dest = htons(np->remote_port);
        udph->len = htons(udp_len);
        udph->check = 0;
+       udph->check = csum_tcpudp_magic(htonl(np->local_ip),
+                                       htonl(np->remote_ip),
+                                       udp_len, IPPROTO_UDP,
+                                       csum_partial((unsigned char *)udph, udp_len, 0));
+       if (udph->check == 0)
+               udph->check = -1;
 
        skb->nh.iph = iph = (struct iphdr *)skb_push(skb, sizeof(*iph));
 

diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index f735455dc5d178c2d61f001e007e03fe8a86b5e4..b8b106358040e16da07b0a78794193035525b161 100644 (file)
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -639,6 +639,7 @@ struct sk_buff *pskb_copy(struct sk_buff *skb, gfp_t gfp_mask)
        n->csum      = skb->csum;
        n->ip_summed = skb->ip_summed;
 
+       n->truesize += skb->data_len;
        n->data_len  = skb->data_len;
        n->len       = skb->len;
 

diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c
index 3456cd331835c738286d6a2cf6c67a5de8aee16b..21f20f21dd3273c770d492494f71c214ea6ea41e 100644 (file)
--- a/net/decnet/af_decnet.c
+++ b/net/decnet/af_decnet.c
@@ -166,7 +166,7 @@ static struct hlist_head *dn_find_list(struct sock *sk)
        if (scp->addr.sdn_flags & SDF_WILD)
                return hlist_empty(&dn_wild_sk) ? &dn_wild_sk : NULL;
 
-       return &dn_sk_hash[scp->addrloc & DN_SK_HASH_MASK];
+       return &dn_sk_hash[dn_ntohs(scp->addrloc) & DN_SK_HASH_MASK];
 }
 
 /* 
@@ -180,7 +180,7 @@ static int check_port(__le16 port)
        if (port == 0)
                return -1;
 
-       sk_for_each(sk, node, &dn_sk_hash[port & DN_SK_HASH_MASK]) {
+       sk_for_each(sk, node, &dn_sk_hash[dn_ntohs(port) & DN_SK_HASH_MASK]) {
                struct dn_scp *scp = DN_SK(sk);
                if (scp->addrloc == port)
                        return -1;
@@ -194,12 +194,12 @@ static unsigned short port_alloc(struct sock *sk)
 static unsigned short port = 0x2000;
        unsigned short i_port = port;
 
-       while(check_port(++port) != 0) {
+       while(check_port(dn_htons(++port)) != 0) {
                if (port == i_port)
                        return 0;
        }
 
-       scp->addrloc = port;
+       scp->addrloc = dn_htons(port);
 
        return 1;
 }
@@ -418,7 +418,7 @@ struct sock *dn_find_by_skb(struct sk_buff *skb)
        struct dn_scp *scp;
 
        read_lock(&dn_hash_lock);
-       sk_for_each(sk, node, &dn_sk_hash[cb->dst_port & DN_SK_HASH_MASK]) {
+       sk_for_each(sk, node, &dn_sk_hash[dn_ntohs(cb->dst_port) & DN_SK_HASH_MASK]) {
                scp = DN_SK(sk);
                if (cb->src != dn_saddr2dn(&scp->peer))
                        continue;
@@ -1016,13 +1016,14 @@ static void dn_access_copy(struct sk_buff *skb, struct accessdata_dn *acc)
 
 static void dn_user_copy(struct sk_buff *skb, struct optdata_dn *opt)
 {
-        unsigned char *ptr = skb->data;
-        
-        opt->opt_optl   = *ptr++;
-        opt->opt_status = 0;
-        memcpy(opt->opt_data, ptr, opt->opt_optl);
-        skb_pull(skb, dn_ntohs(opt->opt_optl) + 1);
-
+       unsigned char *ptr = skb->data;
+       u16 len = *ptr++; /* yes, it's 8bit on the wire */
+
+       BUG_ON(len > 16); /* we've checked the contents earlier */
+       opt->opt_optl   = dn_htons(len);
+       opt->opt_status = 0;
+       memcpy(opt->opt_data, ptr, len);
+       skb_pull(skb, len + 1);
 }
 
 static struct sk_buff *dn_wait_for_connect(struct sock *sk, long *timeo)

diff --git a/net/decnet/dn_nsp_in.c b/net/decnet/dn_nsp_in.c
index 72ecc6e62ec4a6630aef847a702b8e5748299f79..7683d4f754d269dfd642fc92f43cbd1c7bab72dc 100644 (file)
--- a/net/decnet/dn_nsp_in.c
+++ b/net/decnet/dn_nsp_in.c
@@ -360,9 +360,9 @@ static void dn_nsp_conn_conf(struct sock *sk, struct sk_buff *skb)
                        scp->max_window = decnet_no_fc_max_cwnd;
 
                if (skb->len > 0) {
-                       unsigned char dlen = *skb->data;
+                       u16 dlen = *skb->data;
                        if ((dlen <= 16) && (dlen <= skb->len)) {
-                               scp->conndata_in.opt_optl = dn_htons((__u16)dlen);
+                               scp->conndata_in.opt_optl = dn_htons(dlen);
                                memcpy(scp->conndata_in.opt_data, skb->data + 1, dlen);
                        }
                }
@@ -404,9 +404,9 @@ static void dn_nsp_disc_init(struct sock *sk, struct sk_buff *skb)
        memset(scp->discdata_in.opt_data, 0, 16);
 
        if (skb->len > 0) {
-               unsigned char dlen = *skb->data;
+               u16 dlen = *skb->data;
                if ((dlen <= 16) && (dlen <= skb->len)) {
-                       scp->discdata_in.opt_optl = dn_htons((__u16)dlen);
+                       scp->discdata_in.opt_optl = dn_htons(dlen);
                        memcpy(scp->discdata_in.opt_data, skb->data + 1, dlen);
                }
        }

diff --git a/net/decnet/dn_nsp_out.c b/net/decnet/dn_nsp_out.c
index c2e21cd89b3cd273600e80b955f27f1b011d0658..b342e4e8f5f8c936b4efe57b393740cf6f64ad35 100644 (file)
--- a/net/decnet/dn_nsp_out.c
+++ b/net/decnet/dn_nsp_out.c
@@ -526,7 +526,7 @@ void dn_send_conn_conf(struct sock *sk, gfp_t gfp)
         struct nsp_conn_init_msg *msg;
        __u8 len = (__u8)dn_ntohs(scp->conndata_out.opt_optl);
 
-       if ((skb = dn_alloc_skb(sk, 50 + dn_ntohs(scp->conndata_out.opt_optl), gfp)) == NULL)
+       if ((skb = dn_alloc_skb(sk, 50 + len, gfp)) == NULL)
                return;
 
         msg = (struct nsp_conn_init_msg *)skb_put(skb, sizeof(*msg));

diff --git a/net/decnet/dn_rules.c b/net/decnet/dn_rules.c
index 3e0c882c90bfa28a662540e21c97c333a17d4bc6..590e0a72495cf8194a92781e13052f736307130c 100644 (file)
--- a/net/decnet/dn_rules.c
+++ b/net/decnet/dn_rules.c
@@ -124,8 +124,8 @@ static struct nla_policy dn_fib_rule_policy[FRA_MAX+1] __read_mostly = {
 static int dn_fib_rule_match(struct fib_rule *rule, struct flowi *fl, int flags)
 {
        struct dn_fib_rule *r = (struct dn_fib_rule *)rule;
-       u16 daddr = fl->fld_dst;
-       u16 saddr = fl->fld_src;
+       __le16 daddr = fl->fld_dst;
+       __le16 saddr = fl->fld_src;
 
        if (((saddr ^ r->src) & r->srcmask) ||
            ((daddr ^ r->dst) & r->dstmask))

diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 66e9a729f6dfa87060c535d087fba0987bb44116..4322318ab332138ffadd1a9ecfb587ba666efd25 100644 (file)
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -2270,7 +2270,7 @@ void __init tcp_init(void)
                                        thash_entries,
                                        (num_physpages >= 128 * 1024) ?
                                        13 : 15,
-                                       HASH_HIGHMEM,
+                                       0,
                                        &tcp_hashinfo.ehash_size,
                                        NULL,
                                        0);
@@ -2286,7 +2286,7 @@ void __init tcp_init(void)
                                        tcp_hashinfo.ehash_size,
                                        (num_physpages >= 128 * 1024) ?
                                        13 : 15,
-                                       HASH_HIGHMEM,
+                                       0,
                                        &tcp_hashinfo.bhash_size,
                                        NULL,
                                        64 * 1024);

diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c
index 9b9c555c713f0a4666c00657da1b37037928b722..4b52fa78935a025dfd338c374e939bd630c06111 100644 (file)
--- a/net/sched/sch_htb.c
+++ b/net/sched/sch_htb.c
@@ -1284,8 +1284,7 @@ static void htb_destroy_class(struct Qdisc *sch, struct htb_class *cl)
                                                  struct htb_class, sibling));
 
        /* note: this delete may happen twice (see htb_delete) */
-       if (!hlist_unhashed(&cl->hlist))
-               hlist_del(&cl->hlist);
+       hlist_del_init(&cl->hlist);
        list_del(&cl->sibling);
 
        if (cl->prio_activity)
@@ -1333,8 +1332,7 @@ static int htb_delete(struct Qdisc *sch, unsigned long arg)
        sch_tree_lock(sch);
 
        /* delete from hash and active; remainder in destroy_class */
-       if (!hlist_unhashed(&cl->hlist))
-               hlist_del(&cl->hlist);
+       hlist_del_init(&cl->hlist);
 
        if (cl->prio_activity)
                htb_deactivate(q, cl);