diff options
| author |   David S. Miller <davem@davemloft.net> | 2009-05-18 14:48:30 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-05-18 14:48:30 -0700 |
| commit | 82d048186e403f36e083b37ad42aa90abb7dcaac (patch) | |
| tree | dc0b92ace036ef435318f38ef35b8c6e6b84103a /net/mac80211/key.h | |
| parent | ixgbe: Don't reset the hardware when switching between LFC and PFC (diff) | |
| parent | mac80211: make noack test available (diff) | |
| download | linux-dev-82d048186e403f36e083b37ad42aa90abb7dcaac.tar.xz linux-dev-82d048186e403f36e083b37ad42aa90abb7dcaac.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'net/mac80211/key.h')
| -rw-r--r-- | net/mac80211/key.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/key.h b/net/mac80211/key.h index 215d3ef42a4f..9572e00f532c 100644 --- a/net/mac80211/key.h +++ b/net/mac80211/key.h @@ -144,7 +144,8 @@ struct ieee80211_key { struct ieee80211_key *ieee80211_key_alloc(enum ieee80211_key_alg alg, int idx, size_t key_len, - const u8 *key_data); + const u8 *key_data, + size_t seq_len, const u8 *seq); /* * Insert a key into data structures (sdata, sta if necessary) * to make it used, free old key. |