diff options
| author | David S. Miller <davem@davemloft.net> | 2010-10-20 04:59:48 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-10-20 04:59:48 -0400 |
| commit | 5eeaa2db162f1f6d83e988d4d28f4ba7be600e44 (patch) | |
| tree | 440e245201485fcfb7858bf57aae755c00b15651 /include/linux/wireless.h | |
| parent | c5e90f562047ff9713183cf5e18f5e8997bc7373 (diff) | |
| parent | c64557d666eb62eb5f296c6b93bd0a5525ed1e36 (diff) | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'include/linux/wireless.h')
| -rw-r--r-- | include/linux/wireless.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/wireless.h b/include/linux/wireless.h index e6827eedf18b..4395b28bb86c 100644 --- a/include/linux/wireless.h +++ b/include/linux/wireless.h | |||
| @@ -1157,6 +1157,6 @@ struct __compat_iw_event { | |||
| 1157 | #define IW_EV_PARAM_PK_LEN (IW_EV_LCP_PK_LEN + sizeof(struct iw_param)) | 1157 | #define IW_EV_PARAM_PK_LEN (IW_EV_LCP_PK_LEN + sizeof(struct iw_param)) |
| 1158 | #define IW_EV_ADDR_PK_LEN (IW_EV_LCP_PK_LEN + sizeof(struct sockaddr)) | 1158 | #define IW_EV_ADDR_PK_LEN (IW_EV_LCP_PK_LEN + sizeof(struct sockaddr)) |
| 1159 | #define IW_EV_QUAL_PK_LEN (IW_EV_LCP_PK_LEN + sizeof(struct iw_quality)) | 1159 | #define IW_EV_QUAL_PK_LEN (IW_EV_LCP_PK_LEN + sizeof(struct iw_quality)) |
| 1160 | #define IW_EV_POINT_PK_LEN (IW_EV_LCP_LEN + 4) | 1160 | #define IW_EV_POINT_PK_LEN (IW_EV_LCP_PK_LEN + 4) |
| 1161 | 1161 | ||
| 1162 | #endif /* _LINUX_WIRELESS_H */ | 1162 | #endif /* _LINUX_WIRELESS_H */ |