diff options
| author | David S. Miller <davem@davemloft.net> | 2008-07-30 04:51:00 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-30 04:51:00 (GMT) |
| commit | e93dc4891df93d7efa59d861fdcbb529a1819343 (patch) | |
| tree | 545d95bc78c76d44b22bf2590c033311f44c0616 /drivers/net/wireless/b43/xmit.c | |
| parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 (diff) | |
| parent | 56a6d13dfd49d90d72a1a962246206719dd9d143 (diff) | |
| download | linux-e93dc4891df93d7efa59d861fdcbb529a1819343.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/b43/xmit.c')
| -rw-r--r-- | drivers/net/wireless/b43/xmit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/b43/xmit.c b/drivers/net/wireless/b43/xmit.c index 8d54502..9dda816 100644 --- a/drivers/net/wireless/b43/xmit.c +++ b/drivers/net/wireless/b43/xmit.c @@ -192,7 +192,7 @@ int b43_generate_txhdr(struct b43_wldev *dev, const struct b43_phy *phy = &dev->phy; const struct ieee80211_hdr *wlhdr = (const struct ieee80211_hdr *)fragment_data; - int use_encryption = (!(info->flags & IEEE80211_TX_CTL_DO_NOT_ENCRYPT)); + int use_encryption = !!info->control.hw_key; __le16 fctl = wlhdr->frame_control; struct ieee80211_rate *fbrate; u8 rate, rate_fb; |