aboutsummaryrefslogtreecommitdiff
path: root/net/core/rtnetlink.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2007-03-28 02:21:18 -0400
committerJeff Garzik <jeff@garzik.org>2007-03-28 02:21:18 -0400
commita9c87a10db08f53c5220f273d518390cbaeb55c8 (patch)
tree02c62caea88ffae0c4ad945df0d60996d8e5d2f1 /net/core/rtnetlink.c
parentc14bac628b9fad6fd4dad8fbb9e864c61a8924c9 (diff)
parentc2805fbb8630abb95d94ce7adc3f97976f7e0367 (diff)
Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream-fixes
Diffstat (limited to 'net/core/rtnetlink.c')
-rw-r--r--net/core/rtnetlink.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index 6055074c4b8..33ea8eac7fe 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -621,7 +621,8 @@ static int rtnl_getlink(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg)
if (err < 0)
goto errout;
- iw += IW_EV_POINT_OFF;
+ /* Payload is at an offset in buffer */
+ iw = iw_buf + IW_EV_POINT_OFF;
}
#endif /* CONFIG_NET_WIRELESS_RTNETLINK */