Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream-fixes

2 files changed, 11 insertions, 7 deletions

diff --git a/drivers/net/wireless/hostap/hostap_80211_tx.c b/drivers/net/wireless/hostap/hostap_80211_tx.c
index 246fac0e8001..3df3c60263d4 100644
--- a/drivers/net/wireless/hostap/hostap_80211_tx.c
+++ b/drivers/net/wireless/hostap/hostap_80211_tx.c
@@ -311,7 +311,7 @@ static struct sk_buff * hostap_tx_encrypt(struct sk_buff *skb,
         local_info_t *local;
         struct ieee80211_hdr_4addr *hdr;
         u16 fc;
-        int hdr_len, res;
+        int prefix_len, postfix_len, hdr_len, res;
 
         iface = netdev_priv(skb->dev);
         local = iface->local;
@@ -337,10 +337,13 @@ static struct sk_buff * hostap_tx_encrypt(struct sk_buff *skb,
         if (skb == NULL)
                 return NULL;
 
-        if ((skb_headroom(skb) < crypt->ops->extra_mpdu_prefix_len ||
-             skb_tailroom(skb) < crypt->ops->extra_mpdu_postfix_len) &&
-            pskb_expand_head(skb, crypt->ops->extra_mpdu_prefix_len,
-                             crypt->ops->extra_mpdu_postfix_len, GFP_ATOMIC)) {
+        prefix_len = crypt->ops->extra_mpdu_prefix_len +
+                crypt->ops->extra_msdu_prefix_len;
+        postfix_len = crypt->ops->extra_mpdu_postfix_len +
+                crypt->ops->extra_msdu_postfix_len;
+        if ((skb_headroom(skb) < prefix_len ||
+             skb_tailroom(skb) < postfix_len) &&
+            pskb_expand_head(skb, prefix_len, postfix_len, GFP_ATOMIC)) {
                 kfree_skb(skb);
                 return NULL;
         }
diff --git a/drivers/net/wireless/prism54/islpci_eth.c b/drivers/net/wireless/prism54/islpci_eth.c
index dd070cccf324..f49eb068c7d0 100644
--- a/drivers/net/wireless/prism54/islpci_eth.c
+++ b/drivers/net/wireless/prism54/islpci_eth.c
@@ -378,9 +378,10 @@ islpci_eth_receive(islpci_private *priv)
         display_buffer((char *) skb->data, skb->len);
 #endif
         /* take care of monitor mode and spy monitoring. */
-        if (unlikely(priv->iw_mode == IW_MODE_MONITOR))
+        if (unlikely(priv->iw_mode == IW_MODE_MONITOR)) {
+                skb->dev = ndev;
                 discard = islpci_monitor_rx(priv, &skb);
-        else {
+        } else {
                 if (unlikely(skb->data[2 * ETH_ALEN] == 0)) {
                         /* The packet has a rx_annex. Read it for spy monitoring, Then
                          * remove it, while keeping the 2 leading MAC addr.