diff options
| author |   Johannes Berg <johannes.berg@intel.com> | 2017-09-08 11:54:46 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2017-09-21 11:42:01 +0200 |
| commit | 4c121fd690d9c465e4cb09b7859adfdd6a0aee1d (patch) | |
| tree | a5a2bf2efa32f279f3792212d6ebe70b7158c00e /net/mac80211/mesh.c | |
| parent | mac80211: Simplify locking in ieee80211_sta_tear_down_BA_sessions() (diff) | |
| download | linux-dev-4c121fd690d9c465e4cb09b7859adfdd6a0aee1d.tar.xz linux-dev-4c121fd690d9c465e4cb09b7859adfdd6a0aee1d.zip | |
mac80211: use offsetofend()
This was created using the following spatch:
@find@
type S;
expression M, M2;
position p;
@@
offsetof(S, M) + sizeof(M2)@p
@script:python@
m << find.M;
m2 << find.M2;
@@
if not m2.endswith('-> ' + m):
cocci.include_match(False)
@change@
type find.S;
expression find.M, find.M2;
position find.p;
@@
-offsetof(S, M) + sizeof(M2)@p
+offsetofend(S, M)
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/mesh.c')
| -rw-r--r-- | net/mac80211/mesh.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c index a550c707cd8a..7a76c4a6df30 100644 --- a/net/mac80211/mesh.c +++ b/net/mac80211/mesh.c @@ -675,8 +675,7 @@ ieee80211_mesh_build_beacon(struct ieee80211_if_mesh *ifmsh) enum nl80211_band band; u8 *pos; struct ieee80211_sub_if_data *sdata; - int hdr_len = offsetof(struct ieee80211_mgmt, u.beacon) + - sizeof(mgmt->u.beacon); + int hdr_len = offsetofend(struct ieee80211_mgmt, u.beacon); sdata = container_of(ifmsh, struct ieee80211_sub_if_data, u.mesh); rcu_read_lock(); |