diff options
| author | David S. Miller <davem@davemloft.net> | 2011-07-01 01:52:02 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-07-01 01:52:02 -0700 |
| commit | 60c2ce2b4facf28f569115a55e1f479eb12bd0f1 (patch) | |
| tree | 9771312021bbece80efea2fb0823563e4f68b611 /include/net | |
| parent | 0e90ed0e8b9b1c25040442f1d20c799751b1e727 (diff) | |
| parent | 690b0cacb6dbbbcb06b76139ab65e1bf3f63e7f1 (diff) | |
| download | kernel_samsung_smdk4412-60c2ce2b4facf28f569115a55e1f479eb12bd0f1.zip kernel_samsung_smdk4412-60c2ce2b4facf28f569115a55e1f479eb12bd0f1.tar.gz kernel_samsung_smdk4412-60c2ce2b4facf28f569115a55e1f479eb12bd0f1.tar.bz2 | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
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 0589f55..396e8fc 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, * @dev: network device * @addr: The source MAC address of the frame * @key_type: The key type that the received frame used - * @key_id: Key identifier (0..3) + * @key_id: Key identifier (0..3). Can be -1 if missing. * @tsc: The TSC value of the frame that generated the MIC failure (6 octets) * @gfp: allocation flags * |