On Tue, 2009-06-16 at 20:46 +0200, Ivo van Doorn wrote: > From: Johannes Berg <johannes@xxxxxxxxxxxxxxxx> > > Johannes is trying to get rid of the master netdev and in the process will > remove skb->do_not_encrypt field. This removes the do_not_encrypt > usage from rt2x00 to make the change easier. So that worked, thanks! johannes > Signed-off-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx> > Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx> > --- > diff --git a/drivers/net/wireless/rt2x00/rt2x00crypto.c b/drivers/net/wireless/rt2x00/rt2x00crypto.c > index 57ab42c..3ef26f5 100644 > --- a/drivers/net/wireless/rt2x00/rt2x00crypto.c > +++ b/drivers/net/wireless/rt2x00/rt2x00crypto.c > @@ -53,8 +53,7 @@ void rt2x00crypto_create_tx_descriptor(struct queue_entry *entry, > struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(entry->skb); > struct ieee80211_key_conf *hw_key = tx_info->control.hw_key; > > - if (!test_bit(CONFIG_SUPPORT_HW_CRYPTO, &rt2x00dev->flags) || > - !hw_key || entry->skb->do_not_encrypt) > + if (!test_bit(CONFIG_SUPPORT_HW_CRYPTO, &rt2x00dev->flags) || !hw_key) > return; > > __set_bit(ENTRY_TXD_ENCRYPT, &txdesc->flags); > @@ -82,8 +81,7 @@ unsigned int rt2x00crypto_tx_overhead(struct rt2x00_dev *rt2x00dev, > struct ieee80211_key_conf *key = tx_info->control.hw_key; > unsigned int overhead = 0; > > - if (!test_bit(CONFIG_SUPPORT_HW_CRYPTO, &rt2x00dev->flags) || > - !key || skb->do_not_encrypt) > + if (!test_bit(CONFIG_SUPPORT_HW_CRYPTO, &rt2x00dev->flags) || !key) > return overhead; > > /* > diff --git a/drivers/net/wireless/rt2x00/rt2x00mac.c b/drivers/net/wireless/rt2x00/rt2x00mac.c > index c4c06b4..475a3ed 100644 > --- a/drivers/net/wireless/rt2x00/rt2x00mac.c > +++ b/drivers/net/wireless/rt2x00/rt2x00mac.c > @@ -73,7 +73,8 @@ static int rt2x00mac_tx_rts_cts(struct rt2x00_dev *rt2x00dev, > else > rts_info->flags &= ~IEEE80211_TX_CTL_NO_ACK; > > - skb->do_not_encrypt = 1; > + /* Disable hardware encryption */ > + rts_info->control.hw_key = NULL; > > /* > * RTS/CTS frame should use the length of the frame plus any >
Attachment:
signature.asc
Description: This is a digitally signed message part
