diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-02-26 15:34:42 -0500 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-02-26 15:34:42 -0500 |
| commit | 8e22e1b3499a446df48c2b26667ca36c55bf864c (patch) | |
| tree | 5329f98b3eb3c95a9dcbab0fa4f9b6e62f0e788d /net/mac80211/mesh.c | |
| parent | 00d3c14f14d51babd8aeafd5fa734ccf04f5ca3d (diff) | |
| parent | 64a577196d66b44e37384bc5c4d78c61f59d5b2a (diff) | |
Merge airlied/drm-next into drm-misc-next
Backmerge the main pull request to sync up with all the newly landed
drivers. Otherwise we'll have chaos even before 4.12 started in
earnest.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'net/mac80211/mesh.c')
| -rw-r--r-- | net/mac80211/mesh.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c index 42120d965263..50e1b7f78bd4 100644 --- a/net/mac80211/mesh.c +++ b/net/mac80211/mesh.c | |||
| @@ -339,7 +339,7 @@ int mesh_add_vendor_ies(struct ieee80211_sub_if_data *sdata, | |||
| 339 | /* fast-forward to vendor IEs */ | 339 | /* fast-forward to vendor IEs */ |
| 340 | offset = ieee80211_ie_split_vendor(ifmsh->ie, ifmsh->ie_len, 0); | 340 | offset = ieee80211_ie_split_vendor(ifmsh->ie, ifmsh->ie_len, 0); |
| 341 | 341 | ||
| 342 | if (offset) { | 342 | if (offset < ifmsh->ie_len) { |
| 343 | len = ifmsh->ie_len - offset; | 343 | len = ifmsh->ie_len - offset; |
| 344 | data = ifmsh->ie + offset; | 344 | data = ifmsh->ie + offset; |
| 345 | if (skb_tailroom(skb) < len) | 345 | if (skb_tailroom(skb) < len) |