projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[linux-2.6-microblaze.git]
/
net
/
mac80211
/
mesh.c
diff --git
a/net/mac80211/mesh.c
b/net/mac80211/mesh.c
index
9c23172
..
c28b0af
100644
(file)
--- a/
net/mac80211/mesh.c
+++ b/
net/mac80211/mesh.c
@@
-335,7
+335,7
@@
int mesh_add_vendor_ies(struct ieee80211_sub_if_data *sdata,
/* fast-forward to vendor IEs */
offset = ieee80211_ie_split_vendor(ifmsh->ie, ifmsh->ie_len, 0);
- if (offset) {
+ if (offset
< ifmsh->ie_len
) {
len = ifmsh->ie_len - offset;
data = ifmsh->ie + offset;
if (skb_tailroom(skb) < len)