Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (43 commits)
  net: Fix 'Re: PACKET_TX_RING: packet size is too long'
  netdev: usb: dm9601.c can drive a device not supported yet, add support for it
  qlge: Fix firmware mailbox command timeout.
  qlge: Fix EEH handling.
  AF_RAW: Augment raw_send_hdrinc to expand skb to fit iphdr->ihl (v2)
  bonding: fix a race condition in calls to slave MII ioctls
  virtio-net: fix data corruption with OOM
  sfc: Set ip_summed correctly for page buffers passed to GRO
  cnic: Fix L2CTX_STATUSB_NUM offset in context memory.
  MAINTAINERS: rt2x00 list is moderated
  airo: Reorder tests, check bounds before element
  mac80211: fix for incorrect sequence number on hostapd injected frames
  libertas spi: fix sparse errors
  mac80211: trivial: fix spelling in mesh_hwmp
  cfg80211: sme: deauthenticate on assoc failure
  mac80211: keep auth state when assoc fails
  mac80211: fix ibss joining
  b43: add 'struct b43_wl' missing declaration
  b43: Fix Bugzilla #14181 and the bug from the previous 'fix'
  rt2x00: Fix crypto in TX frame for rt2800usb
  ...

11 files changed, 65 insertions, 29 deletions

diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index 86acdba0a97d..6eb8d47cbf3a 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -335,6 +335,7 @@ struct pktgen_dev {
         __u32 cur_src_mac_offset;
         __be32 cur_saddr;
         __be32 cur_daddr;
+        __u16 ip_id;
         __u16 cur_udp_dst;
         __u16 cur_udp_src;
         __u16 cur_queue_map;
@@ -2630,6 +2631,8 @@ static struct sk_buff *fill_packet_ipv4(struct net_device *odev,
         iph->protocol = IPPROTO_UDP;    /* UDP */
         iph->saddr = pkt_dev->cur_saddr;
         iph->daddr = pkt_dev->cur_daddr;
+        iph->id = htons(pkt_dev->ip_id);
+        pkt_dev->ip_id++;
         iph->frag_off = 0;
         iplen = 20 + 8 + datalen;
         iph->tot_len = htons(iplen);
@@ -2641,24 +2644,26 @@ static struct sk_buff *fill_packet_ipv4(struct net_device *odev,
         skb->dev = odev;
         skb->pkt_type = PACKET_HOST;
 
-        if (pkt_dev->nfrags <= 0)
+        if (pkt_dev->nfrags <= 0) {
                 pgh = (struct pktgen_hdr *)skb_put(skb, datalen);
-        else {
+                memset(pgh + 1, 0, datalen - sizeof(struct pktgen_hdr));
+        } else {
                 int frags = pkt_dev->nfrags;
-                int i;
+                int i, len;
 
                 pgh = (struct pktgen_hdr *)(((char *)(udph)) + 8);
 
                 if (frags > MAX_SKB_FRAGS)
                         frags = MAX_SKB_FRAGS;
                 if (datalen > frags * PAGE_SIZE) {
-                        skb_put(skb, datalen - frags * PAGE_SIZE);
+                        len = datalen - frags * PAGE_SIZE;
+                        memset(skb_put(skb, len), 0, len);
                         datalen = frags * PAGE_SIZE;
                 }
 
                 i = 0;
                 while (datalen > 0) {
-                        struct page *page = alloc_pages(GFP_KERNEL, 0);
+                        struct page *page = alloc_pages(GFP_KERNEL | __GFP_ZERO, 0);
                         skb_shinfo(skb)->frags[i].page = page;
                         skb_shinfo(skb)->frags[i].page_offset = 0;
                         skb_shinfo(skb)->frags[i].size =
diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
index 757c9171e7c2..ab996f9c0fe0 100644
--- a/net/ipv4/raw.c
+++ b/net/ipv4/raw.c
@@ -352,13 +352,24 @@ static int raw_send_hdrinc(struct sock *sk, void *from, size_t length,
         skb->ip_summed = CHECKSUM_NONE;
 
         skb->transport_header = skb->network_header;
-        err = memcpy_fromiovecend((void *)iph, from, 0, length);
-        if (err)
-                goto error_fault;
+        err = -EFAULT;
+        if (memcpy_fromiovecend((void *)iph, from, 0, length))
+                goto error_free;
 
-        /* We don't modify invalid header */
         iphlen = iph->ihl * 4;
-        if (iphlen >= sizeof(*iph) && iphlen <= length) {
+
+        /*
+         * We don't want to modify the ip header, but we do need to
+         * be sure that it won't cause problems later along the network
+         * stack.  Specifically we want to make sure that iph->ihl is a
+         * sane value.  If ihl points beyond the length of the buffer passed
+         * in, reject the frame as invalid
+         */
+        err = -EINVAL;
+        if (iphlen > length)
+                goto error_free;
+
+        if (iphlen >= sizeof(*iph)) {
                 if (!iph->saddr)
                         iph->saddr = rt->rt_src;
                 iph->check   = 0;
@@ -381,8 +392,7 @@ static int raw_send_hdrinc(struct sock *sk, void *from, size_t length,
 out:
         return 0;
 
-error_fault:
-        err = -EFAULT;
+error_free:
         kfree_skb(skb);
 error:
         IP_INC_STATS(net, IPSTATS_MIB_OUTDISCARDS);
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 90b2e0649bfb..98440ad82558 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -1442,9 +1442,9 @@ int tcp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
                                 goto found_ok_skb;
                         if (tcp_hdr(skb)->fin)
                                 goto found_fin_ok;
-                        if (WARN_ON(!(flags & MSG_PEEK)))
-                                printk(KERN_INFO "recvmsg bug 2: copied %X "
-                                       "seq %X\n", *seq, TCP_SKB_CB(skb)->seq);
+                        WARN(!(flags & MSG_PEEK), KERN_INFO "recvmsg bug 2: "
+                                        "copied %X seq %X\n", *seq,
+                                        TCP_SKB_CB(skb)->seq);
                 }
 
                 /* Well, if we have backlog, try to process it now yet. */
diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c
index 6eaf69823439..ca8ecce31d34 100644
--- a/net/mac80211/ibss.c
+++ b/net/mac80211/ibss.c
@@ -538,13 +538,12 @@ static void ieee80211_sta_find_ibss(struct ieee80211_sub_if_data *sdata)
                                        WLAN_CAPABILITY_PRIVACY,
                                        capability);
 
+        if (bss) {
 #ifdef CONFIG_MAC80211_IBSS_DEBUG
-        if (bss)
                 printk(KERN_DEBUG "   sta_find_ibss: selected %pM current "
                        "%pM\n", bss->cbss.bssid, ifibss->bssid);
 #endif /* CONFIG_MAC80211_IBSS_DEBUG */
 
-        if (bss && !memcmp(ifibss->bssid, bss->cbss.bssid, ETH_ALEN)) {
                 printk(KERN_DEBUG "%s: Selected IBSS BSSID %pM"
                        " based on configured SSID\n",
                        sdata->dev->name, bss->cbss.bssid);
@@ -552,8 +551,7 @@ static void ieee80211_sta_find_ibss(struct ieee80211_sub_if_data *sdata)
                 ieee80211_sta_join_ibss(sdata, bss);
                 ieee80211_rx_bss_put(local, bss);
                 return;
-        } else if (bss)
-                ieee80211_rx_bss_put(local, bss);
+        }
 
 #ifdef CONFIG_MAC80211_IBSS_DEBUG
         printk(KERN_DEBUG "   did not try to join ibss\n");
diff --git a/net/mac80211/mesh_hwmp.c b/net/mac80211/mesh_hwmp.c
index e12a786e26b8..29b82e98effa 100644
--- a/net/mac80211/mesh_hwmp.c
+++ b/net/mac80211/mesh_hwmp.c
@@ -259,7 +259,7 @@ static u32 airtime_link_metric_get(struct ieee80211_local *local,
  * @hwmp_ie: hwmp information element (PREP or PREQ)
  *
  * This function updates the path routing information to the originator and the
- * transmitter of a HWMP PREQ or PREP fram.
+ * transmitter of a HWMP PREQ or PREP frame.
  *
  * Returns: metric to frame originator or 0 if the frame should not be further
  * processed
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 8d26e9bf8964..dc5049d58c51 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -1457,8 +1457,7 @@ ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata,
         if (status_code != WLAN_STATUS_SUCCESS) {
                 printk(KERN_DEBUG "%s: AP denied association (code=%d)\n",
                        sdata->dev->name, status_code);
-                list_del(&wk->list);
-                kfree(wk);
+                wk->state = IEEE80211_MGD_STATE_IDLE;
                 return RX_MGMT_CFG80211_ASSOC;
         }
 
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index db4bda681ec9..eaa4118de988 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -1445,7 +1445,7 @@ static void ieee80211_xmit(struct ieee80211_sub_if_data *sdata,
                                 if (tmp_sdata->vif.type != NL80211_IFTYPE_AP)
                                         continue;
                                 if (compare_ether_addr(tmp_sdata->dev->dev_addr,
-                                                       hdr->addr2)) {
+                                                       hdr->addr2) == 0) {
                                         dev_hold(tmp_sdata->dev);
                                         dev_put(sdata->dev);
                                         sdata = tmp_sdata;
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index d7ecca0a0c07..f2d116a5cb35 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -982,10 +982,7 @@ static int tpacket_snd(struct packet_sock *po, struct msghdr *msg)
                 goto out_put;
 
         size_max = po->tx_ring.frame_size
-                - sizeof(struct skb_shared_info)
-                - po->tp_hdrlen
-                - LL_ALLOCATED_SPACE(dev)
-                - sizeof(struct sockaddr_ll);
+                - (po->tp_hdrlen - sizeof(struct sockaddr_ll));
 
         if (size_max > dev->mtu + reserve)
                 size_max = dev->mtu + reserve;
diff --git a/net/wireless/core.h b/net/wireless/core.h
index 2a33d8bc886b..68b321997d4c 100644
--- a/net/wireless/core.h
+++ b/net/wireless/core.h
@@ -358,6 +358,7 @@ int cfg80211_mgd_wext_connect(struct cfg80211_registered_device *rdev,
                               struct wireless_dev *wdev);
 
 void cfg80211_conn_work(struct work_struct *work);
+void cfg80211_sme_failed_assoc(struct wireless_dev *wdev);
 bool cfg80211_sme_failed_reassoc(struct wireless_dev *wdev);
 
 /* internal helpers */
diff --git a/net/wireless/mlme.c b/net/wireless/mlme.c
index 79d2eec54cec..0a6b7a0eca6b 100644
--- a/net/wireless/mlme.c
+++ b/net/wireless/mlme.c
@@ -62,6 +62,7 @@ void cfg80211_send_rx_assoc(struct net_device *dev, const u8 *buf, size_t len)
         u8 *ie = mgmt->u.assoc_resp.variable;
         int i, ieoffs = offsetof(struct ieee80211_mgmt, u.assoc_resp.variable);
         struct cfg80211_internal_bss *bss = NULL;
+        bool need_connect_result = true;
 
         wdev_lock(wdev);
 
@@ -94,6 +95,14 @@ void cfg80211_send_rx_assoc(struct net_device *dev, const u8 *buf, size_t len)
                 }
 
                 WARN_ON(!bss);
+        } else if (wdev->conn) {
+                cfg80211_sme_failed_assoc(wdev);
+                need_connect_result = false;
+                /*
+                 * do not call connect_result() now because the
+                 * sme will schedule work that does it later.
+                 */
+                goto out;
         }
 
         if (!wdev->conn && wdev->sme_state == CFG80211_SME_IDLE) {
diff --git a/net/wireless/sme.c b/net/wireless/sme.c
index 93c3ed329204..ece378d531ef 100644
--- a/net/wireless/sme.c
+++ b/net/wireless/sme.c
@@ -26,6 +26,7 @@ struct cfg80211_conn {
                 CFG80211_CONN_AUTHENTICATING,
                 CFG80211_CONN_ASSOCIATE_NEXT,
                 CFG80211_CONN_ASSOCIATING,
+                CFG80211_CONN_DEAUTH_ASSOC_FAIL,
         } state;
         u8 bssid[ETH_ALEN], prev_bssid[ETH_ALEN];
         u8 *ie;
@@ -148,6 +149,12 @@ static int cfg80211_conn_do_work(struct wireless_dev *wdev)
                                                NULL, 0,
                                                WLAN_REASON_DEAUTH_LEAVING);
                 return err;
+        case CFG80211_CONN_DEAUTH_ASSOC_FAIL:
+                __cfg80211_mlme_deauth(rdev, wdev->netdev, params->bssid,
+                                       NULL, 0,
+                                       WLAN_REASON_DEAUTH_LEAVING);
+                /* return an error so that we call __cfg80211_connect_result() */
+                return -EINVAL;
         default:
                 return 0;
         }
@@ -158,6 +165,7 @@ void cfg80211_conn_work(struct work_struct *work)
         struct cfg80211_registered_device *rdev =
                 container_of(work, struct cfg80211_registered_device, conn_work);
         struct wireless_dev *wdev;
+        u8 bssid[ETH_ALEN];
 
         rtnl_lock();
         cfg80211_lock_rdev(rdev);
@@ -173,10 +181,10 @@ void cfg80211_conn_work(struct work_struct *work)
                         wdev_unlock(wdev);
                         continue;
                 }
+                memcpy(bssid, wdev->conn->params.bssid, ETH_ALEN);
                 if (cfg80211_conn_do_work(wdev))
                         __cfg80211_connect_result(
-                                        wdev->netdev,
-                                        wdev->conn->params.bssid,
+                                        wdev->netdev, bssid,
                                         NULL, 0, NULL, 0,
                                         WLAN_STATUS_UNSPECIFIED_FAILURE,
                                         false, NULL);
@@ -337,6 +345,15 @@ bool cfg80211_sme_failed_reassoc(struct wireless_dev *wdev)
         return true;
 }
 
+void cfg80211_sme_failed_assoc(struct wireless_dev *wdev)
+{
+        struct wiphy *wiphy = wdev->wiphy;
+        struct cfg80211_registered_device *rdev = wiphy_to_dev(wiphy);
+
+        wdev->conn->state = CFG80211_CONN_DEAUTH_ASSOC_FAIL;
+        schedule_work(&rdev->conn_work);
+}
+
 void __cfg80211_connect_result(struct net_device *dev, const u8 *bssid,
                                const u8 *req_ie, size_t req_ie_len,
                                const u8 *resp_ie, size_t resp_ie_len,