← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise-security

« back to all changes in this revision

Viewing changes to drivers/net/wireless/rt2x00/rt2x00crypto.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati
  • Date: 2011-12-06 15:56:07 UTC
  • Revision ID: package-import@ubuntu.com-20111206155607-pcf44kv5fmhk564f
Tags: 3.2.0-1401.1
[ Paolo Pisati ]

* Rebased on top of Ubuntu-3.2.0-3.8
* Tilt-tracking @ ef2487af4bb15bdd0689631774b5a5e3a59f74e2
* Delete debian.ti-omap4/control, it shoudln't be tracked
* Fix architecture spelling (s/armel/armhf/)
* [Config] Update configs following 3.2 import
* [Config] Fix compilation: disable CODA and ARCH_OMAP3
* [Config] Fix compilation: disable Ethernet Faraday
* Update series to precise

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/net/wireless/rt2x00/rt2x00crypto.c
45
45
        }
46
46
}
47
47
 
48
 
void rt2x00crypto_create_tx_descriptor(struct queue_entry *entry,
 
48
void rt2x00crypto_create_tx_descriptor(struct rt2x00_dev *rt2x00dev,
 
49
                                       struct sk_buff *skb,
49
50
                                       struct txentry_desc *txdesc)
50
51
{
51
 
        struct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev;
52
 
        struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(entry->skb);
 
52
        struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);
53
53
        struct ieee80211_key_conf *hw_key = tx_info->control.hw_key;
54
54
 
55
55
        if (!test_bit(CAPABILITY_HW_CRYPTO, &rt2x00dev->cap_flags) || !hw_key)