diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-06-30 11:26:04 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-06-30 11:26:04 -0400 |
| commit | 690b0cacb6dbbbcb06b76139ab65e1bf3f63e7f1 (patch) | |
| tree | 9199b20addcd9167a210957ac477a284c6f9a73d /include/net | |
| parent | 16adf5d07987d93675945f3cecf0e33706566005 (diff) | |
| parent | a0b8de350be458b33248e48b2174d9af8a4c4798 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into for-davem
Diffstat (limited to 'include/net')
| -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 | * |