diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
| commit | bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71 (patch) | |
| tree | 2f6dffd2d3e4dd67355a224de7e7a960335a92fd /include/net/ieee80211_radiotap.h | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'include/net/ieee80211_radiotap.h')
| -rw-r--r-- | include/net/ieee80211_radiotap.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/ieee80211_radiotap.h b/include/net/ieee80211_radiotap.h index 23c3f3d97779..9d3d86aaccbb 100644 --- a/include/net/ieee80211_radiotap.h +++ b/include/net/ieee80211_radiotap.h | |||
| @@ -80,7 +80,7 @@ struct ieee80211_radiotap_header { | |||
| 80 | * Additional extensions are made | 80 | * Additional extensions are made |
| 81 | * by setting bit 31. | 81 | * by setting bit 31. |
| 82 | */ | 82 | */ |
| 83 | }; | 83 | } __packed; |
| 84 | 84 | ||
| 85 | /* Name Data type Units | 85 | /* Name Data type Units |
| 86 | * ---- --------- ----- | 86 | * ---- --------- ----- |