diff options
| author | Luis R. Rodriguez <mcgrof@do-not-panic.com> | 2013-07-19 01:24:11 +0000 |
|---|---|---|
| committer | Luis R. Rodriguez <mcgrof@do-not-panic.com> | 2013-07-19 15:05:32 -0700 |
| commit | e2d5a26742e025ec4e24129c132589ec3b491eb4 (patch) | |
| tree | 4090b9226dedf973f3ca627e093574c53635a2bd /patches/collateral-evolutions/network/0006-disable-dump-adjust-on-old-kernels.patch | |
| parent | d7608058240bc8bba1b4ee9f3cc59029184d0545 (diff) | |
backports: refresh patches for next-20130627
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
Diffstat (limited to 'patches/collateral-evolutions/network/0006-disable-dump-adjust-on-old-kernels.patch')
| -rw-r--r-- | patches/collateral-evolutions/network/0006-disable-dump-adjust-on-old-kernels.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/patches/collateral-evolutions/network/0006-disable-dump-adjust-on-old-kernels.patch b/patches/collateral-evolutions/network/0006-disable-dump-adjust-on-old-kernels.patch index c13d053c..7b48d3dd 100644 --- a/patches/collateral-evolutions/network/0006-disable-dump-adjust-on-old-kernels.patch +++ b/patches/collateral-evolutions/network/0006-disable-dump-adjust-on-old-kernels.patch @@ -28,15 +28,15 @@ Date: Fri Mar 1 14:03:49 2013 +0100 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c -@@ -1571,6 +1571,7 @@ static int nl80211_dump_wiphy(struct sk_ - &cb->args[2], - &cb->args[3]); +@@ -1597,6 +1597,7 @@ static int nl80211_dump_wiphy(struct sk_ + cb->nlh->nlmsg_seq, + NLM_F_MULTI, state); if (ret < 0) { +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0) /* * If sending the wiphy data didn't fit (ENOBUFS * or EMSGSIZE returned), this SKB is still -@@ -1591,6 +1592,7 @@ static int nl80211_dump_wiphy(struct sk_ +@@ -1617,6 +1618,7 @@ static int nl80211_dump_wiphy(struct sk_ rtnl_unlock(); return 1; } |