diff options
| author | David S. Miller <davem@davemloft.net> | 2011-07-01 04:52:02 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-07-01 04:52:02 -0400 |
| commit | 60c2ce2b4facf28f569115a55e1f479eb12bd0f1 (patch) | |
| tree | 9771312021bbece80efea2fb0823563e4f68b611 /include | |
| parent | 0e90ed0e8b9b1c25040442f1d20c799751b1e727 (diff) | |
| parent | 690b0cacb6dbbbcb06b76139ab65e1bf3f63e7f1 (diff) | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/cfg80211.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index 0589f554788a..396e8fc8910e 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h | |||
| @@ -2688,7 +2688,7 @@ void cfg80211_send_unprot_disassoc(struct net_device *dev, const u8 *buf, | |||
| 2688 | * @dev: network device | 2688 | * @dev: network device |
| 2689 | * @addr: The source MAC address of the frame | 2689 | * @addr: The source MAC address of the frame |
| 2690 | * @key_type: The key type that the received frame used | 2690 | * @key_type: The key type that the received frame used |
| 2691 | * @key_id: Key identifier (0..3) | 2691 | * @key_id: Key identifier (0..3). Can be -1 if missing. |
| 2692 | * @tsc: The TSC value of the frame that generated the MIC failure (6 octets) | 2692 | * @tsc: The TSC value of the frame that generated the MIC failure (6 octets) |
| 2693 | * @gfp: allocation flags | 2693 | * @gfp: allocation flags |
| 2694 | * | 2694 | * |