From: "John W. Linville" <linville@tuxdriver.com> To: jeff@garzik.org Cc: linux-wireless@vger.kernel.org, netdev@vger.kernel.org Subject: Please pull 'upstream-fixes' branch of wireless-2.6 Date: Tue, 29 May 2007 14:30:37 -0400 [thread overview] Message-ID: <20070529183037.GB3496@tuxdriver.com> (raw) The following changes since commit c420bc9f09a0926b708c3edb27eacba434a4= f4ba: Linus Torvalds (1): Linux 2.6.22-rc3 are found in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.g= it upstream-fixes Akinobu Mita (2): ieee80211: fix incomplete error message softmac: alloc_ieee80211() NULL check Bj=F6rn Steinbrink (1): prism54: fix monitor mode oops Brandon Craig Rhodes (1): hostap: Allocate enough tailroom for TKIP drivers/net/wireless/hostap/hostap_80211_tx.c | 13 ++++++++----- drivers/net/wireless/prism54/islpci_eth.c | 5 +++-- net/ieee80211/ieee80211_module.c | 2 +- net/ieee80211/softmac/ieee80211softmac_module.c | 5 ++++- 4 files changed, 16 insertions(+), 9 deletions(-) diff --git a/drivers/net/wireless/hostap/hostap_80211_tx.c b/drivers/ne= t/wireless/hostap/hostap_80211_tx.c index 246fac0..3df3c60 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; =20 iface =3D netdev_priv(skb->dev); local =3D iface->local; @@ -337,10 +337,13 @@ static struct sk_buff * hostap_tx_encrypt(struct = sk_buff *skb, if (skb =3D=3D NULL) return NULL; =20 - 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 =3D crypt->ops->extra_mpdu_prefix_len + + crypt->ops->extra_msdu_prefix_len; + postfix_len =3D 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/wi= reless/prism54/islpci_eth.c index dd070cc..f49eb06 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 =3D=3D IW_MODE_MONITOR)) + if (unlikely(priv->iw_mode =3D=3D IW_MODE_MONITOR)) { + skb->dev =3D ndev; discard =3D islpci_monitor_rx(priv, &skb); - else { + } else { if (unlikely(skb->data[2 * ETH_ALEN] =3D=3D 0)) { /* The packet has a rx_annex. Read it for spy monitoring, Then * remove it, while keeping the 2 leading MAC addr. diff --git a/net/ieee80211/ieee80211_module.c b/net/ieee80211/ieee80211= _module.c index 7ec6610..17ad278 100644 --- a/net/ieee80211/ieee80211_module.c +++ b/net/ieee80211/ieee80211_module.c @@ -140,7 +140,7 @@ struct net_device *alloc_ieee80211(int sizeof_priv) =20 dev =3D alloc_etherdev(sizeof(struct ieee80211_device) + sizeof_priv)= ; if (!dev) { - IEEE80211_ERROR("Unable to network device.\n"); + IEEE80211_ERROR("Unable to allocate network device.\n"); goto failed; } ieee =3D netdev_priv(dev); diff --git a/net/ieee80211/softmac/ieee80211softmac_module.c b/net/ieee= 80211/softmac/ieee80211softmac_module.c index e9cdc66..c308756 100644 --- a/net/ieee80211/softmac/ieee80211softmac_module.c +++ b/net/ieee80211/softmac/ieee80211softmac_module.c @@ -33,7 +33,10 @@ struct net_device *alloc_ieee80211softmac(int sizeof= _priv) struct ieee80211softmac_device *softmac; struct net_device *dev; =20 - dev =3D alloc_ieee80211(sizeof(struct ieee80211softmac_device) + size= of_priv); + dev =3D alloc_ieee80211(sizeof(*softmac) + sizeof_priv); + if (!dev) + return NULL; + softmac =3D ieee80211_priv(dev); softmac->dev =3D dev; softmac->ieee =3D netdev_priv(dev); --=20 John W. Linville linville@tuxdriver.com - To unsubscribe from this list: send the line "unsubscribe linux-wireles= s" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
WARNING: multiple messages have this Message-ID (diff)
From: "John W. Linville" <linville-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org> To: jeff-o2qLIJkoznsdnm+yROfE0A@public.gmane.org Cc: linux-wireless-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Subject: Please pull 'upstream-fixes' branch of wireless-2.6 Date: Tue, 29 May 2007 14:30:37 -0400 [thread overview] Message-ID: <20070529183037.GB3496@tuxdriver.com> (raw) The following changes since commit c420bc9f09a0926b708c3edb27eacba434a4f4ba: Linus Torvalds (1): Linux 2.6.22-rc3 are found in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git upstream-fixes Akinobu Mita (2): ieee80211: fix incomplete error message softmac: alloc_ieee80211() NULL check Björn Steinbrink (1): prism54: fix monitor mode oops Brandon Craig Rhodes (1): hostap: Allocate enough tailroom for TKIP drivers/net/wireless/hostap/hostap_80211_tx.c | 13 ++++++++----- drivers/net/wireless/prism54/islpci_eth.c | 5 +++-- net/ieee80211/ieee80211_module.c | 2 +- net/ieee80211/softmac/ieee80211softmac_module.c | 5 ++++- 4 files changed, 16 insertions(+), 9 deletions(-) diff --git a/drivers/net/wireless/hostap/hostap_80211_tx.c b/drivers/net/wireless/hostap/hostap_80211_tx.c index 246fac0..3df3c60 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 dd070cc..f49eb06 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. diff --git a/net/ieee80211/ieee80211_module.c b/net/ieee80211/ieee80211_module.c index 7ec6610..17ad278 100644 --- a/net/ieee80211/ieee80211_module.c +++ b/net/ieee80211/ieee80211_module.c @@ -140,7 +140,7 @@ struct net_device *alloc_ieee80211(int sizeof_priv) dev = alloc_etherdev(sizeof(struct ieee80211_device) + sizeof_priv); if (!dev) { - IEEE80211_ERROR("Unable to network device.\n"); + IEEE80211_ERROR("Unable to allocate network device.\n"); goto failed; } ieee = netdev_priv(dev); diff --git a/net/ieee80211/softmac/ieee80211softmac_module.c b/net/ieee80211/softmac/ieee80211softmac_module.c index e9cdc66..c308756 100644 --- a/net/ieee80211/softmac/ieee80211softmac_module.c +++ b/net/ieee80211/softmac/ieee80211softmac_module.c @@ -33,7 +33,10 @@ struct net_device *alloc_ieee80211softmac(int sizeof_priv) struct ieee80211softmac_device *softmac; struct net_device *dev; - dev = alloc_ieee80211(sizeof(struct ieee80211softmac_device) + sizeof_priv); + dev = alloc_ieee80211(sizeof(*softmac) + sizeof_priv); + if (!dev) + return NULL; + softmac = ieee80211_priv(dev); softmac->dev = dev; softmac->ieee = netdev_priv(dev); -- John W. Linville linville-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org
next reply other threads:[~2007-05-29 18:56 UTC|newest] Thread overview: 67+ messages / expand[flat|nested] mbox.gz Atom feed top 2007-05-29 18:30 John W. Linville [this message] 2007-05-29 18:30 ` Please pull 'upstream-fixes' branch of wireless-2.6 John W. Linville 2007-05-29 18:31 ` Please pull 'upstream' " John W. Linville 2007-05-30 14:03 ` Jeff Garzik 2007-05-30 13:46 ` Please pull 'upstream-fixes' " Jeff Garzik 2007-05-30 13:46 ` Jeff Garzik -- strict thread matches above, loose matches on Subject: below -- 2007-05-22 15:17 John W. Linville 2007-05-22 15:17 John W. Linville 2007-05-24 21:17 ` Jeff Garzik 2007-04-10 20:23 John W. Linville 2007-04-11 15:58 ` Jeff Garzik 2007-03-27 18:26 John W. Linville 2007-03-28 6:21 ` Jeff Garzik 2007-03-16 21:31 John W. Linville 2007-03-08 3:30 John W. Linville 2007-03-09 16:58 ` Jeff Garzik 2007-02-27 20:50 John W. Linville 2007-03-03 0:41 ` Jeff Garzik 2007-02-02 21:27 Please pull "upstream-fixes" " John W. Linville 2007-02-07 0:06 ` Jeff Garzik 2007-02-07 0:06 ` Jeff Garzik 2007-01-18 15:48 Please pull 'upstream-fixes' " John W. Linville 2007-01-18 16:46 ` Jeff Garzik 2007-01-03 2:41 John W. Linville 2006-12-21 3:03 John W. Linville 2006-12-26 21:39 ` Jeff Garzik 2006-11-15 1:29 John W. Linville 2006-11-28 19:14 ` John W. Linville 2006-11-08 4:58 John W. Linville 2006-11-10 16:11 ` Jeff Garzik 2006-10-17 21:34 John W. Linville 2006-10-21 18:22 ` Jeff Garzik 2006-09-11 23:58 John W. Linville 2006-09-12 15:42 ` Jeff Garzik 2006-08-23 18:46 John W. Linville 2006-08-24 4:41 ` Jeff Garzik 2006-08-04 20:58 John W. Linville 2006-08-09 3:48 ` Jeff Garzik 2006-08-02 21:56 John W. Linville 2006-08-03 21:19 ` Jeff Garzik 2006-07-28 0:22 John W. Linville 2006-07-29 4:32 ` Jeff Garzik 2006-07-10 21:29 John W. Linville 2006-06-05 21:53 John W. Linville 2006-06-08 19:46 ` Jeff Garzik 2006-05-26 20:37 John W. Linville 2006-05-27 1:26 ` Jeff Garzik 2006-05-22 19:18 John W. Linville 2006-05-24 4:26 ` Jeff Garzik 2006-05-24 8:52 ` Andrew Morton 2006-05-17 19:34 John W. Linville 2006-05-06 1:06 Please pull upstream-fixes " John W. Linville 2006-05-06 3:08 ` Andrew Morton 2006-05-06 3:20 ` Linus Torvalds 2006-05-06 4:12 ` Stephen Hemminger 2006-05-06 13:45 ` John W. Linville 2006-04-24 19:40 Please pull 'upstream-fixes' " John W. Linville 2006-04-26 10:17 ` Jeff Garzik 2006-04-20 1:12 Please pull upstream-fixes " John W. Linville 2006-04-20 8:51 ` Michael Buesch 2006-04-20 8:57 ` Andrew Morton 2006-04-20 9:12 ` Michael Buesch 2006-04-20 12:53 ` John W. Linville 2006-04-20 19:58 ` Andrew Morton 2006-04-20 22:28 ` Linus Torvalds 2006-04-20 9:00 ` Jeff Garzik 2006-04-20 21:36 ` Jeff Garzik
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20070529183037.GB3496@tuxdriver.com \ --to=linville@tuxdriver.com \ --cc=jeff@garzik.org \ --cc=linux-wireless@vger.kernel.org \ --cc=netdev@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.