diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-07-13 15:57:29 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-07-13 15:57:29 -0400 |
| commit | e300d955debdadf599c36e47eb0bc16f5976215c (patch) | |
| tree | 8fafcc789dc06e90665e6eee6388af228bbd2fd7 /net/mac80211/wpa.c | |
| parent | 242647bcf8464860f173f3d4d4ab3490d3558518 (diff) | |
| parent | 815868e7b5c207ba42d5b317ccc51f8112732268 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Conflicts:
drivers/net/wireless/wl12xx/wl1271_cmd.h
Diffstat (limited to 'net/mac80211/wpa.c')
| -rw-r--r-- | net/mac80211/wpa.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/mac80211/wpa.c b/net/mac80211/wpa.c index a14e67707476..8d59d27d887e 100644 --- a/net/mac80211/wpa.c +++ b/net/mac80211/wpa.c | |||
| @@ -183,9 +183,8 @@ static int tkip_encrypt_skb(struct ieee80211_tx_data *tx, struct sk_buff *skb) | |||
| 183 | skb_put(skb, TKIP_ICV_LEN); | 183 | skb_put(skb, TKIP_ICV_LEN); |
| 184 | 184 | ||
| 185 | hdr = (struct ieee80211_hdr *) skb->data; | 185 | hdr = (struct ieee80211_hdr *) skb->data; |
| 186 | ieee80211_tkip_encrypt_data(tx->local->wep_tx_tfm, | 186 | return ieee80211_tkip_encrypt_data(tx->local->wep_tx_tfm, |
| 187 | key, pos, len, hdr->addr2); | 187 | key, pos, len, hdr->addr2); |
| 188 | return 0; | ||
| 189 | } | 188 | } |
| 190 | 189 | ||
| 191 | 190 | ||