Update compat.diff
Luis R. Rodriguez
AppliedQuoted 4 lines · pat-lkml
This updates compat.diff for wireless-testing commit
68a4ef439847ed4bc07f17d398fe06c34f15d5daSigned-off-by Pat Erley<[email protected]>
Thanks applied, now just waiting for git pull to finish on wireless.ker= nel.org.
Luis
Quoted 9 lines
---
compat/compat.diff +0
-0@@ -440,64 +440,35 @@ index a0c860f..9c6f214 100644 =C2=A0 =C2=A0 =C2=A0 =C2=A0return ops; =C2=A0}
compat/compat.diff index a0c860f..9c6f214 100644 · line 452
Quoted 10 lines
compat/compat.diff +0
-10-diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c -index c157d60..40f86df 100644 ---- a/net/wireless/nl80211.c -+++ b/net/wireless/nl80211.c -@@ -21,6 +21,7 @@ - #include "nl80211.h" - #include "reg.h" - -+#if (LINUX_VERSION_CODE >=3D KERNEL_VERSION(2,6,30)) - static int nl80211_lock_doit(struct sk_buff *skb, struct genl_info =
*info)
compat/compat.diff index a0c860f..9c6f214 100644 · line 462
Quoted 10 lines
compat/compat.diff +0
-10- { - =C2=A0 =C2=A0 =C2=A0 rtnl_lock(); -@@ -38,6 +39,7 @@ - =C2=A0 =C2=A0 =C2=A0 rtnl_unlock(); - } - -+#endif - /* the netlink family */ - static struct genl_family nl80211_fam =3D { - =C2=A0 =C2=A0 =C2=A0 .id =3D GENL_ID_GENERATE, /* don't bother with=
a hardcoded ID */
compat/compat.diff index a0c860f..9c6f214 100644 · line 464
Quoted 2 lines
compat/compat.diff +0
-2-@@ -45,10 +47,12 @@ - =C2=A0 =C2=A0 =C2=A0 .hdrsize =3D 0, =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 /* no private header */
compat/compat.diff index a0c860f..9c6f214 100644 · line 465
Quoted 1 line
compat/compat.diff +0
-1- =C2=A0 =C2=A0 =C2=A0 .version =3D 1, =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 /* no particular meaning now */
compat/compat.diff index a0c860f..9c6f214 100644 · line 443
Quoted 12 lines
compat/compat.diff +1
-11- =C2=A0 =C2=A0 =C2=A0 .maxattr =3D NL80211_ATTR_MAX, -+#if (LINUX_VERSION_CODE >=3D KERNEL_VERSION(2,6,30)) - =C2=A0 =C2=A0 =C2=A0 .pre_doit =3D nl80211_lock_doit, - =C2=A0 =C2=A0 =C2=A0 .pre_dumpit =3D nl80211_lock_dumpit, - =C2=A0 =C2=A0 =C2=A0 .post_doit =3D nl80211_unlock, - =C2=A0 =C2=A0 =C2=A0 .post_dumpit =3D nl80211_unlock, -+#endif - }; - - /* internal helper: get drv and dev */ -@@ -637,12 +641,18 @@ +--- wireless-testing/net/wireless/nl80211.c =C2=A0 =C2=A02009-02-27 =
18:27:32.000000000 -0500
compat/compat.diff index a0c860f..9c6f214 100644 · line 444
Quoted 1 line
compat/compat.diff +1
-0++++ compat-wireless-2.6/net/wireless/nl80211.c 2009-02-27 19:51:08.0=
00000000 -0500
Quoted 3 lines
compat/compat.diff +2
-0+@@ -614,15 +614,17 @@ + =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 if (!err)=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0=
=C2=A0 =C2=A0flags =3D &_flags;
Quoted 7 lines
=C2=A0 =C2=A0 =C2=A0 =C2=A0}
-
=C2=A0+#if (LINUX_VERSION_CODE<KERNEL_VERSION(2,6,30))
-+ =C2=A0 =C2=A0 =C2=A0rtnl_lock();
+ =C2=A0 =C2=A0 =C2=A0rtnl_lock();
=C2=A0+#endif
=C2=A0 =C2=A0 =C2=A0 =C2=A0err =3D drv->ops->change_virtual_intf(&drv=
->wiphy, ifindex,
Quoted 1 line
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0=
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =
=C2=A0 =C2=A0type, flags, ¶ms);
Quoted 2 lines
=C2=A0 =C2=A0 =C2=A0 =C2=A0dev =3D __dev_get_by_index(&init_net, ifin=
dex);
Quoted 1 line
=C2=A0 =C2=A0 =C2=A0 =C2=A0WARN_ON(!dev || (!err && dev->ieee80211_pt=
r->iftype !=3D type));
Quoted 5 lines
-
+-
=C2=A0+#if (LINUX_VERSION_CODE<KERNEL_VERSION(2,6,30)) -+ =C2=A0 =C2=A0 =C2=A0rtnl_unlock();
+ =C2=A0 =C2=A0 =C2=A0rtnl_unlock();
Quoted 8 lines
+-
=C2=A0+#endif
=C2=A0 unlock:
=C2=A0 =C2=A0 =C2=A0 =C2=A0cfg80211_put_dev(drv);
=C2=A0 =C2=A0 =C2=A0 =C2=A0return err;
-@@ -683,12 +693,18 @@
+@@ -662,16 +664,18 @@
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 params.mesh_id =3D=
nla_data(info->attrs[NL80211_ATTR_MESH_ID]);
Quoted 1 line
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0params.mesh_id=
_len =3D nla_len(info->attrs[NL80211_ATTR_MESH_ID]);
Quoted 8 lines
=C2=A0 =C2=A0 =C2=A0 =C2=A0}
-
+-
=C2=A0+#if (LINUX_VERSION_CODE<KERNEL_VERSION(2,6,30))
-+ =C2=A0 =C2=A0 =C2=A0rtnl_lock();
+ =C2=A0 =C2=A0 =C2=A0rtnl_lock();
=C2=A0+#endif
=C2=A0 =C2=A0 =C2=A0 =C2=A0err =3D parse_monitor_flags(type =3D=3D NL=
80211_IFTYPE_MONITOR ?
Quoted 1 line
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0=
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0info->attrs[NL80211_AT=TR_MNTR_FLAGS] : NULL,
Quoted 4 lines
compat/compat.diff +0
-0@@ -506,117 +477,131 @@ index c157d60..40f86df 100644=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0nla_data(info-= attrs[NL80211_ATTR_IFNAME]),
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0type, err ? NU=
LL : &flags, ¶ms);
Quoted 11 lines
=C2=A0+#if (
LINUX_VERSION_CODE<KERNEL_VERSION(2,6,30)) -+ =C2=A0 =C2=A0 =C2=A0rtnl_unlock();
+ =C2=A0 =C2=A0 =C2=A0rtnl_unlock();
+-
=C2=A0+#endif=C2=A0 unlock:
=C2=A0 =C2=A0 =C2=A0 =C2=A0cfg80211_put_dev(drv);
-@@ -712,7 +728,13 @@
+@@ -694,11 +698,13 @@
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 err =3D -EOPNOTSUP=
P;
Quoted 7 lines
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0goto out; =C2=A0 =C2=A0 =C2=A0 =C2=A0}
-
+-
=C2=A0+#if (LINUX_VERSION_CODE<KERNEL_VERSION(2,6,30))
-+ =C2=A0 =C2=A0 =C2=A0rtnl_lock();
-+ =C2=A0 =C2=A0 =C2=A0err =3D drv->ops->del_virtual_intf(&drv->wiphy=
, ifindex);
Quoted 4 lines
-+ =C2=A0 =C2=A0 =C2=A0rtnl_unlock();
-+#else
+ =C2=A0 =C2=A0 =C2=A0rtnl_lock();
=C2=A0 =C2=A0 =C2=A0 =C2=A0err =3D drv->ops->del_virtual_intf(&drv->w=
iphy, ifindex);
Quoted 4 lines
+ =C2=A0 =C2=A0 =C2=A0
rtnl_unlock();
+-
++#else
++ =C2=A0 =C2=A0 =C2=A0err =3D drv->ops->del_virtual_intf(&drv->wiphy=
, ifindex);
Quoted 9 lines
=C2=A0+#endif
-
=C2=A0 out:
=C2=A0 =C2=A0 =C2=A0 =C2=A0cfg80211_put_dev(drv);
-@@ -797,8 +819,15 @@
+ =C2=A0 =C2=A0 =C2=A0 return err;
+@@ -782,11 +788,15 @@
=C2=A0 =C2=A0 =C2=A0 =C2=A0if (mac_addr)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0NLA_PUT(msg, N=
L80211_ATTR_MAC, ETH_ALEN, mac_addr);
Quoted 5 lines
=C2=A0+#if (
LINUX_VERSION_CODE<KERNEL_VERSION(2,6,30))
-+ =C2=A0 =C2=A0 =C2=A0rtnl_lock();
+ =C2=A0 =C2=A0 =C2=A0rtnl_lock();
=C2=A0 =C2=A0 =C2=A0 =C2=A0err =3D drv->ops->get_key(&drv->wiphy, dev=
, key_idx, mac_addr,
Quoted 1 line
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0=
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0&cookie, get_key_callback);
Quoted 5 lines
-+ =C2=A0 =C2=A0 =C2=A0rtnl_unlock();
+ =C2=A0 =C2=A0 =C2=A0rtnl_unlock();
+-
=C2=A0+#else
=C2=A0+ =C2=A0 =C2=A0 =C2=A0err =3D drv->ops->get_key(&drv->wiphy, de=
v, key_idx, mac_addr,
Quoted 1 line
-+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0&cookie, get_key_callback);
Quoted 1 line
++ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0&cookie, get_key_callback)= ;
Quoted 8 lines
=C2=A0+#endif
-
=C2=A0 =C2=A0 =C2=A0 =C2=A0if (err)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0goto out; -@@ -858,7 +887,13 @@
+
+@@ -844,11 +854,13 @@
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 err =3D -EOPNOTSUP=
P;
Quoted 13 lines
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0goto out; =C2=A0 =C2=A0 =C2=A0 =C2=A0}
-
+-
=C2=A0+#if (LINUX_VERSION_CODE<KERNEL_VERSION(2,6,30)) -+ =C2=A0 =C2=A0 =C2=A0rtnl_lock();
+ =C2=A0 =C2=A0 =C2=A0rtnl_lock();
=C2=A0 =C2=A0 =C2=A0 =C2=A0err =3Dfunc(&drv->wiphy, dev, key_idx); -+ =C2=A0 =C2=A0 =C2=A0rtnl_unlock();
+ =C2=A0 =C2=A0 =C2=A0rtnl_unlock();
+-
=C2=A0+#else
=C2=A0+ =C2=A0 =C2=A0 =C2=A0err =3Dfunc(&drv->wiphy, dev, key_idx);
Quoted 8 lines
=C2=A0+#endif
-
=C2=A0 out:
=C2=A0 =C2=A0 =C2=A0 =C2=A0cfg80211_put_dev(drv);
-@@ -941,7 +976,13 @@
+ =C2=A0 =C2=A0 =C2=A0dev_put(dev);
+@@ -929,10 +941,13 @@
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 err =3D -EOPNOTSUP=
P;
Quoted 7 lines
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0goto out; =C2=A0 =C2=A0 =C2=A0 =C2=A0}
-
+-
=C2=A0+#if (LINUX_VERSION_CODE<KERNEL_VERSION(2,6,30))
-+ =C2=A0 =C2=A0 =C2=A0rtnl_lock();
-+ =C2=A0 =C2=A0 =C2=A0err =3D drv->ops->add_key(&drv->wiphy, dev, ke=
y_idx, mac_addr, ¶ms);
Quoted 4 lines
-+ =C2=A0 =C2=A0 =C2=A0rtnl_unlock();
-+#else
+ =C2=A0 =C2=A0 =C2=A0rtnl_lock();
=C2=A0 =C2=A0 =C2=A0 =C2=A0err =3D drv->ops->add_key(&drv->wiphy, dev=
, key_idx, mac_addr, ¶ms);
Quoted 3 lines
+ =C2=A0 =C2=A0 =C2=A0
rtnl_unlock();
++#else
++ =C2=A0 =C2=A0 =C2=A0err =3D drv->ops->add_key(&drv->wiphy, dev, ke=
y_idx, mac_addr, ¶ms);
Quoted 7 lines
=C2=A0+#endif
=C2=A0 out:
=C2=A0 =C2=A0 =C2=A0 =C2=A0cfg80211_put_dev(drv);
-@@ -975,7 +1016,13 @@
+@@ -965,10 +980,13 @@
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 err =3D -EOPNOTSUP=
P;
Quoted 7 lines
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0goto out; =C2=A0 =C2=A0 =C2=A0 =C2=A0}
-
+-
=C2=A0+#if (LINUX_VERSION_CODE<KERNEL_VERSION(2,6,30))
-+ =C2=A0 =C2=A0 =C2=A0rtnl_lock();
-+ =C2=A0 =C2=A0 =C2=A0err =3D drv->ops->del_key(&drv->wiphy, dev, ke=
y_idx, mac_addr);
Quoted 4 lines
-+ =C2=A0 =C2=A0 =C2=A0rtnl_unlock();
-+#else
+ =C2=A0 =C2=A0 =C2=A0rtnl_lock();
=C2=A0 =C2=A0 =C2=A0 =C2=A0err =3D drv->ops->del_key(&drv->wiphy, dev=
, key_idx, mac_addr);
Quoted 3 lines
+ =C2=A0 =C2=A0 =C2=A0
rtnl_unlock();
++#else
++ =C2=A0 =C2=A0 =C2=A0err =3D drv->ops->del_key(&drv->wiphy, dev, ke=
y_idx, mac_addr);
Quoted 20 lines
=C2=A0+#endif
=C2=A0 out:
=C2=A0 =C2=A0 =C2=A0 =C2=A0cfg80211_put_dev(drv);
-@@ -1056,7 +1103,13 @@
+@@ -1048,11 +1066,13 @@
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 err =3D-EINVAL; =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0goto out; =C2=A0 =C2=A0 =C2=A0 =C2=A0}
-
+-
=C2=A0+#if (LINUX_VERSION_CODE<KERNEL_VERSION(2,6,30)) -+ =C2=A0 =C2=A0 =C2=A0rtnl_lock();
+ =C2=A0 =C2=A0 =C2=A0rtnl_lock();
=C2=A0 =C2=A0 =C2=A0 =C2=A0err =3Dcall(&drv->wiphy, dev, ¶ms); -+ =C2=A0 =C2=A0 =C2=A0rtnl_unlock();
+ =C2=A0 =C2=A0 =C2=A0rtnl_unlock();
+-
=C2=A0+#else
=C2=A0+ =C2=A0 =C2=A0 =C2=A0err =3Dcall(&drv->wiphy, dev, ¶ms);
Quoted 8 lines
=C2=A0+#endif
-
=C2=A0 out:
=C2=A0 =C2=A0 =C2=A0 =C2=A0cfg80211_put_dev(drv);
-@@ -1079,7 +1132,13 @@
+ =C2=A0 =C2=A0 =C2=A0dev_put(dev);
+@@ -1073,11 +1093,13 @@
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 err =3D -EOPNOTSUP=
P;
Quoted 8 lines
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0goto out; =C2=A0 =C2=A0 =C2=A0 =C2=A0}
-
+-
=C2=A0+#if (LINUX_VERSION_CODE<KERNEL_VERSION(2,6,30))
-+ =C2=A0 =C2=A0 =C2=A0rtnl_lock();
+ =C2=A0 =C2=A0 =C2=A0rtnl_lock();
=C2=A0 =C2=A0 =C2=A0 =C2=A0err =3D drv->ops->del_beacon(&drv->wiphy, =
dev);
Quoted 5 lines
-+ =C2=A0 =C2=A0 =C2=A0rtnl_unlock();
+ =C2=A0 =C2=A0 =C2=A0rtnl_unlock();
+-
=C2=A0+#else
=C2=A0+ =C2=A0 =C2=A0 =C2=A0err =3D drv->ops->del_beacon(&drv->wiphy,=
dev);
Quoted 11 lines
=C2=A0+#endif
-
=C2=A0 out:
=C2=A0 =C2=A0 =C2=A0 =C2=A0cfg80211_put_dev(drv);
-@@ -1264,13 +1323,20 @@
+ =C2=A0 =C2=A0 =C2=A0dev_put(dev);
+@@ -1260,16 +1282,20 @@
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 err =3D-ENOSYS; =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0gotoout_err; =C2=A0 =C2=A0 =C2=A0 =C2=A0}
-
Quoted 8 lines
+-
=C2=A0+#if (LINUX_VERSION_CODE<KERNEL_VERSION(2,6,30))
-+ =C2=A0 =C2=A0 =C2=A0rtnl_lock();
+ =C2=A0 =C2=A0 =C2=A0rtnl_lock();
+-
=C2=A0+#endif
=C2=A0 =C2=A0 =C2=A0 =C2=A0while (1) {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0err =3D dev->o=
ps->dump_station(&dev->wiphy, netdev, sta_idx,
Quoted 2 lines
compat/compat.diff +0
-0@@ -625,288 +610,243 @@ index c157d60..40f86df 100644=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0=
=C2=A0 =C2=A0break;
Quoted 3 lines
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if (err) =C2=A0+#if (
LINUX_VERSION_CODE<KERNEL_VERSION(2,6,30))
-+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0goto out_err_rtnl;
Quoted 1 line
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0=
=C2=A0 goto out_err_rtnl;
Quoted 2 lines
=C2=A0+#else
- =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0=
=C2=A0 goto out_err;
Quoted 1 line
++ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0goto out_err;
Quoted 3 lines
=C2=A0+#endif
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if (nl80211_se=
nd_station(skb,
Quoted 1 line
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0=
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0NETLINK_CB(cb->skb).pid,
Quoted 19 lines
-@@ -1286,6 +1352,10 @@
+@@ -1285,8 +1311,10 @@
=C2=A0 out:
=C2=A0 =C2=A0 =C2=A0 =C2=A0cb->args[1] =3Dsta_idx; =C2=A0 =C2=A0 =C2=A0 =C2=A0err =3Dskb->len; =C2=A0+#if (LINUX_VERSION_CODE<KERNEL_VERSION(2,6,30)) -+out_err_rtnl:
-+ =C2=A0 =C2=A0 =C2=A0rtnl_unlock();
+ =C2=A0out_err_rtnl:
+ =C2=A0 =C2=A0 =C2=A0rtnl_unlock();
=C2=A0+#endif
=C2=A0out_err:
=C2=A0 =C2=A0 =C2=A0 =C2=A0cfg80211_put_dev(dev); =C2=A0out_put_netdev:
-@@ -1319,7 +1389,13 @@
+@@ -1320,9 +1348,13 @@
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0goto out; =C2=A0 =C2=A0 =C2=A0 =C2=A0}
Quoted 4 lines
=C2=A0+#if (
LINUX_VERSION_CODE<KERNEL_VERSION(2,6,30))
-+ =C2=A0 =C2=A0 =C2=A0rtnl_lock();
+ =C2=A0 =C2=A0 =C2=A0rtnl_lock();
=C2=A0 =C2=A0 =C2=A0 =C2=A0err =3D drv->ops->get_station(&drv->wiphy,=
dev, mac_addr, &sinfo);
Quoted 4 lines
-+ =C2=A0 =C2=A0 =C2=A0rtnl_unlock();
+ =C2=A0 =C2=A0 =C2=A0rtnl_unlock();
=C2=A0+#else
=C2=A0+ =C2=A0 =C2=A0 =C2=A0err =3D drv->ops->get_station(&drv->wiphy=
, dev, mac_addr, &sinfo);
Quoted 9 lines
=C2=A0+#endif
=C2=A0 =C2=A0 =C2=A0 =C2=A0if (err)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0goto out; -@@ -1421,7 +1497,13 @@
+@@ -1424,9 +1456,13 @@
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0goto out; =C2=A0 =C2=A0 =C2=A0 =C2=A0}
Quoted 4 lines
=C2=A0+#if (
LINUX_VERSION_CODE<KERNEL_VERSION(2,6,30))
-+ =C2=A0 =C2=A0 =C2=A0rtnl_lock();
+ =C2=A0 =C2=A0 =C2=A0rtnl_lock();
=C2=A0 =C2=A0 =C2=A0 =C2=A0err =3D drv->ops->change_station(&drv->wip=
hy, dev, mac_addr, ¶ms);
Quoted 4 lines
-+ =C2=A0 =C2=A0 =C2=A0rtnl_unlock();
+ =C2=A0 =C2=A0 =C2=A0rtnl_unlock();
=C2=A0+#else
=C2=A0+ =C2=A0 =C2=A0 =C2=A0err =3D drv->ops->change_station(&drv->wi=
phy, dev, mac_addr, ¶ms);
Quoted 9 lines
=C2=A0+#endif
=C2=A0 out:
=C2=A0 =C2=A0 =C2=A0 =C2=A0if (params.vlan)
-@@ -1482,7 +1564,13 @@
+@@ -1487,9 +1523,13 @@
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0goto out; =C2=A0 =C2=A0 =C2=A0 =C2=A0}
Quoted 3 lines
=C2=A0+#if (
LINUX_VERSION_CODE<KERNEL_VERSION(2,6,30))
-+ =C2=A0 =C2=A0 =C2=A0rtnl_lock();
-+ =C2=A0 =C2=A0 =C2=A0err =3D drv->ops->add_station(&drv->wiphy, dev=
, mac_addr, ¶ms);
Quoted 4 lines
-+ =C2=A0 =C2=A0 =C2=A0rtnl_unlock();
-+#else
+ =C2=A0 =C2=A0 =C2=A0rtnl_lock();
=C2=A0 =C2=A0 =C2=A0 =C2=A0err =3D drv->ops->add_station(&drv->wiphy,=
dev, mac_addr, ¶ms);
Quoted 3 lines
+ =C2=A0 =C2=A0 =C2=A0
rtnl_unlock();
++#else
++ =C2=A0 =C2=A0 =C2=A0err =3D drv->ops->add_station(&drv->wiphy, dev=
, mac_addr, ¶ms);
Quoted 9 lines
=C2=A0+#endif
=C2=A0 out:
=C2=A0 =C2=A0 =C2=A0 =C2=A0if (params.vlan)
-@@ -1511,7 +1599,13 @@
+@@ -1518,9 +1558,13 @@
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0goto out; =C2=A0 =C2=A0 =C2=A0 =C2=A0}
Quoted 3 lines
=C2=A0+#if (
LINUX_VERSION_CODE<KERNEL_VERSION(2,6,30))
-+ =C2=A0 =C2=A0 =C2=A0rtnl_lock();
-+ =C2=A0 =C2=A0 =C2=A0err =3D drv->ops->del_station(&drv->wiphy, dev=
, mac_addr);
Quoted 4 lines
-+ =C2=A0 =C2=A0 =C2=A0rtnl_unlock();
-+#else
+ =C2=A0 =C2=A0 =C2=A0rtnl_lock();
=C2=A0 =C2=A0 =C2=A0 =C2=A0err =3D drv->ops->del_station(&drv->wiphy,=
dev, mac_addr);
Quoted 3 lines
+ =C2=A0 =C2=A0 =C2=A0
rtnl_unlock();
++#else
++ =C2=A0 =C2=A0 =C2=A0err =3D drv->ops->del_station(&drv->wiphy, dev=
, mac_addr);
Quoted 9 lines
=C2=A0+#endif
=C2=A0 out:
=C2=A0 =C2=A0 =C2=A0 =C2=A0cfg80211_put_dev(drv);
-@@ -1611,13 +1705,20 @@
+@@ -1620,7 +1664,9 @@
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0gotoout_err; =C2=A0 =C2=A0 =C2=A0 =C2=A0}
Quoted 7 lines
=C2=A0+#if (
LINUX_VERSION_CODE<KERNEL_VERSION(2,6,30))
-+ =C2=A0 =C2=A0 =C2=A0rtnl_lock();
+ =C2=A0 =C2=A0 =C2=A0rtnl_lock();
=C2=A0+#endif
+
=C2=A0 =C2=A0 =C2=A0 =C2=A0while (1) {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0err =3D dev->o=
ps->dump_mpath(&dev->wiphy, netdev, path_idx,
Quoted 1 line
- =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0=
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =
=C2=A0dst, next_hop, &pinfo);
Quoted 2 lines
+@@ -1628,7 +1674,11 @@
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if (err =3D=3D=
-ENOENT)
Quoted 1 line
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0=
=C2=A0 =C2=A0break;
Quoted 3 lines
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if (err) =C2=A0+#if (
LINUX_VERSION_CODE<KERNEL_VERSION(2,6,30))
-+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0goto out_err_rtnl;
Quoted 1 line
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0=
=C2=A0 goto out_err_rtnl;
Quoted 2 lines
=C2=A0+#else
- =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0=
=C2=A0 goto out_err;
Quoted 1 line
++ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0goto out_err;
Quoted 3 lines
=C2=A0+#endif
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if (nl80211_se=
nd_mpath(skb, NETLINK_CB(cb->skb).pid,
Quoted 1 line
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0=
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 cb->nlh=
->nlmsg_seq, NLM_F_MULTI,
Quoted 19 lines
-@@ -1632,6 +1733,10 @@
+@@ -1643,8 +1693,10 @@
=C2=A0 out:
=C2=A0 =C2=A0 =C2=A0 =C2=A0cb->args[1] =3Dpath_idx; =C2=A0 =C2=A0 =C2=A0 =C2=A0err =3Dskb->len; =C2=A0+#if (LINUX_VERSION_CODE<KERNEL_VERSION(2,6,30)) -+out_err_rtnl:
-+ =C2=A0 =C2=A0 =C2=A0rtnl_unlock();
+ =C2=A0out_err_rtnl:
+ =C2=A0 =C2=A0 =C2=A0rtnl_unlock();
=C2=A0+#endif
=C2=A0out_err:
=C2=A0 =C2=A0 =C2=A0 =C2=A0cfg80211_put_dev(dev); =C2=A0out_put_netdev:
-@@ -1666,7 +1771,13 @@
+@@ -1679,9 +1731,13 @@
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0goto out; =C2=A0 =C2=A0 =C2=A0 =C2=A0}
Quoted 3 lines
=C2=A0+#if (
LINUX_VERSION_CODE<KERNEL_VERSION(2,6,30))
-+ =C2=A0 =C2=A0 =C2=A0rtnl_lock();
-+ =C2=A0 =C2=A0 =C2=A0err =3D drv->ops->get_mpath(&drv->wiphy, dev, =
dst, next_hop, &pinfo);
Quoted 4 lines
-+ =C2=A0 =C2=A0 =C2=A0rtnl_unlock();
-+#else
+ =C2=A0 =C2=A0 =C2=A0rtnl_lock();
=C2=A0 =C2=A0 =C2=A0 =C2=A0err =3D drv->ops->get_mpath(&drv->wiphy, d=
ev, dst, next_hop, &pinfo);
Quoted 3 lines
+ =C2=A0 =C2=A0 =C2=A0
rtnl_unlock();
++#else
++ =C2=A0 =C2=A0 =C2=A0err =3D drv->ops->get_mpath(&drv->wiphy, dev, =
dst, next_hop, &pinfo);
Quoted 9 lines
=C2=A0+#endif
=C2=A0 =C2=A0 =C2=A0 =C2=A0if (err)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0goto out; -@@ -1717,7 +1828,13 @@
+@@ -1732,9 +1788,13 @@
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0goto out; =C2=A0 =C2=A0 =C2=A0 =C2=A0}
Quoted 3 lines
=C2=A0+#if (
LINUX_VERSION_CODE<KERNEL_VERSION(2,6,30))
-+ =C2=A0 =C2=A0 =C2=A0rtnl_lock();
-+ =C2=A0 =C2=A0 =C2=A0err =3D drv->ops->change_mpath(&drv->wiphy, de=
v, dst, next_hop);
Quoted 4 lines
-+ =C2=A0 =C2=A0 =C2=A0rtnl_unlock();
-+#else
+ =C2=A0 =C2=A0 =C2=A0rtnl_lock();
=C2=A0 =C2=A0 =C2=A0 =C2=A0err =3D drv->ops->change_mpath(&drv->wiphy=
, dev, dst, next_hop);
Quoted 3 lines
+ =C2=A0 =C2=A0 =C2=A0
rtnl_unlock();
++#else
++ =C2=A0 =C2=A0 =C2=A0err =3D drv->ops->change_mpath(&drv->wiphy, de=
v, dst, next_hop);
Quoted 9 lines
=C2=A0+#endif
=C2=A0 out:
=C2=A0 =C2=A0 =C2=A0 =C2=A0cfg80211_put_dev(drv);
-@@ -1750,7 +1867,13 @@
+@@ -1767,9 +1827,13 @@
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0goto out; =C2=A0 =C2=A0 =C2=A0 =C2=A0}
Quoted 3 lines
=C2=A0+#if (
LINUX_VERSION_CODE<KERNEL_VERSION(2,6,30))
-+ =C2=A0 =C2=A0 =C2=A0rtnl_lock();
-+ =C2=A0 =C2=A0 =C2=A0err =3D drv->ops->add_mpath(&drv->wiphy, dev, =
dst, next_hop);
Quoted 4 lines
-+ =C2=A0 =C2=A0 =C2=A0rtnl_unlock();
-+#else
+ =C2=A0 =C2=A0 =C2=A0rtnl_lock();
=C2=A0 =C2=A0 =C2=A0 =C2=A0err =3D drv->ops->add_mpath(&drv->wiphy, d=
ev, dst, next_hop);
Quoted 3 lines
+ =C2=A0 =C2=A0 =C2=A0
rtnl_unlock();
++#else
++ =C2=A0 =C2=A0 =C2=A0err =3D drv->ops->add_mpath(&drv->wiphy, dev, =
dst, next_hop);
Quoted 9 lines
=C2=A0+#endif
=C2=A0 out:
=C2=A0 =C2=A0 =C2=A0 =C2=A0cfg80211_put_dev(drv);
-@@ -1777,7 +1900,13 @@
+@@ -1796,9 +1860,13 @@
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0goto out; =C2=A0 =C2=A0 =C2=A0 =C2=A0}
Quoted 4 lines
=C2=A0+#if (
LINUX_VERSION_CODE<KERNEL_VERSION(2,6,30))
-+ =C2=A0 =C2=A0 =C2=A0rtnl_lock();
+ =C2=A0 =C2=A0 =C2=A0rtnl_lock();
=C2=A0 =C2=A0 =C2=A0 =C2=A0err =3D drv->ops->del_mpath(&drv->wiphy, d=
ev, dst);
Quoted 4 lines
-+ =C2=A0 =C2=A0 =C2=A0rtnl_unlock();
+ =C2=A0 =C2=A0 =C2=A0rtnl_unlock();
=C2=A0+#else
=C2=A0+ =C2=A0 =C2=A0 =C2=A0err =3D drv->ops->del_mpath(&drv->wiphy, =
dev, dst);
Quoted 9 lines
=C2=A0+#endif
=C2=A0 out:
=C2=A0 =C2=A0 =C2=A0 =C2=A0cfg80211_put_dev(drv);
-@@ -1823,7 +1952,13 @@
+@@ -1844,9 +1912,13 @@
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0goto out; =C2=A0 =C2=A0 =C2=A0 =C2=A0}
Quoted 4 lines
=C2=A0+#if (
LINUX_VERSION_CODE<KERNEL_VERSION(2,6,30))
-+ =C2=A0 =C2=A0 =C2=A0rtnl_lock();
+ =C2=A0 =C2=A0 =C2=A0rtnl_lock();
=C2=A0 =C2=A0 =C2=A0 =C2=A0err =3D drv->ops->change_bss(&drv->wiphy, =
dev, ¶ms);
Quoted 4 lines
-+ =C2=A0 =C2=A0 =C2=A0rtnl_unlock();
+ =C2=A0 =C2=A0 =C2=A0rtnl_unlock();
=C2=A0+#else
=C2=A0+ =C2=A0 =C2=A0 =C2=A0err =3D drv->ops->change_bss(&drv->wiphy,=
dev, ¶ms);
Quoted 8 lines
=C2=A0+#endif
=C2=A0 out:
=C2=A0 =C2=A0 =C2=A0 =C2=A0cfg80211_put_dev(drv);
-@@ -1920,7 +2055,13 @@
+@@ -1951,9 +2023,13 @@
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return err;
Quoted 4 lines
=C2=A0 =C2=A0 =C2=A0 =C2=A0/* Get the mesh params */ =C2=A0+#if (
LINUX_VERSION_CODE<KERNEL_VERSION(2,6,30))
-+ =C2=A0 =C2=A0 =C2=A0rtnl_lock();
-+ =C2=A0 =C2=A0 =C2=A0err =3D drv->ops->get_mesh_params(&drv->wiphy,=
dev, &cur_params);
Quoted 4 lines
-+ =C2=A0 =C2=A0 =C2=A0rtnl_unlock();
-+#else
+ =C2=A0 =C2=A0 =C2=A0rtnl_lock();
=C2=A0 =C2=A0 =C2=A0 =C2=A0err =3D drv->ops->get_mesh_params(&drv->wi=
phy, dev, &cur_params);
Quoted 3 lines
+ =C2=A0 =C2=A0 =C2=A0
rtnl_unlock();
++#else
++ =C2=A0 =C2=A0 =C2=A0err =3D drv->ops->get_mesh_params(&drv->wiphy,=
dev, &cur_params);
Quoted 7 lines
=C2=A0+#endif
=C2=A0 =C2=A0 =C2=A0 =C2=A0if (err)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0goto out;-@@ -2066,7 +2207,13 @@
+@@ -2099,9 +2175,13 @@
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0=
=C2=A0 =C2=A0nla_get_u16);
Quoted 5 lines
=C2=A0 =C2=A0 =C2=A0 =C2=A0/* Apply changes */
=C2=A0+#if (LINUX_VERSION_CODE<KERNEL_VERSION(2,6,30))
-+ =C2=A0 =C2=A0 =C2=A0rtnl_lock();
-+ =C2=A0 =C2=A0 =C2=A0err =3D drv->ops->set_mesh_params(&drv->wiphy,=
dev, &cfg, mask);
Quoted 4 lines
-+ =C2=A0 =C2=A0 =C2=A0rtnl_unlock();
-+#else
+ =C2=A0 =C2=A0 =C2=A0rtnl_lock();
=C2=A0 =C2=A0 =C2=A0 =C2=A0err =3D drv->ops->set_mesh_params(&drv->wi=
phy, dev, &cfg, mask);
Quoted 3 lines
+ =C2=A0 =C2=A0 =C2=A0
rtnl_unlock();
++#else
++ =C2=A0 =C2=A0 =C2=A0err =3D drv->ops->set_mesh_params(&drv->wiphy,=
dev, &cfg, mask);
Quoted 9 lines
=C2=A0+#endif
=C2=A0 =C2=A0 =C2=A0 =C2=A0/* cleanup */
=C2=A0 =C2=A0 =C2=A0 =C2=A0cfg80211_put_dev(drv);
-@@ -2241,9 +2388,15 @@
- =C2=A0 =C2=A0 =C2=A0 if (err)
+@@ -2277,9 +2357,13 @@
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return err;
Quoted 7 lines
-- =C2=A0 =C2=A0 =C2=A0if (
drv->ops->set_mgmt_extra_ie)
-+ =C2=A0 =C2=A0 =C2=A0if (drv->ops->set_mgmt_extra_ie) {
+ =C2=A0 =C2=A0 =C2=A0 if (drv->ops->set_mgmt_extra_ie) { =C2=A0+#if (LINUX_VERSION_CODE<KERNEL_VERSION(2,6,30))
-+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0rtnl_lock();
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0rtnl_lock(); =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0err =3D drv->o=
ps->set_mgmt_extra_ie(&drv->wiphy, dev, ¶ms);
Quoted 5 lines
-- =C2=A0 =C2=A0 =C2=A0else
-+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0rtnl_unlock();
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0rtnl_unlock(); =C2=A0+#else
=C2=A0+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0err =3D drv->=
ops->set_mgmt_extra_ie(&drv->wiphy, dev, ¶ms);
Quoted 4 lines
=C2=A0+#endif
-+ =C2=A0 =C2=A0 =C2=A0} else
+ =C2=A0 =C2=A0 =C2=A0 } else
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0err =3D -EOPNO=
TSUPP;
Quoted 5 lines
- =C2=A0 =C2=A0 =C2=A0
cfg80211_put_dev(drv);
-@@ -2275,9 +2428,16 @@
+@@ -2311,9 +2395,9 @@
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 err =3D -EOPNOTSUP=
P;
Quoted 11 lines
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0goto out; =C2=A0 =C2=A0 =C2=A0 =C2=A0}
-
+-
=C2=A0+#if (LINUX_VERSION_CODE<KERNEL_VERSION(2,6,30))
-+ =C2=A0 =C2=A0 =C2=A0rtnl_lock();
+ =C2=A0 =C2=A0 =C2=A0rtnl_lock();
+-
=C2=A0+#endif
=C2=A0 =C2=A0 =C2=A0 =C2=A0if (drv->scan_req) {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0err =3D -EBUSY=
;
Quoted 8 lines
-+#if (
LINUX_VERSION_CODE<KERNEL_VERSION(2,6,30))
-+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0gotoout_unlock; -+#else
- =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 goto out; -+#endif
- =C2=A0 =C2=A0 =C2=A0 }
-
- =C2=A0 =C2=A0 =C2=A0 if (info->attrs[NL80211_ATTR_SCAN_FREQUENCIES]=
) {
Quoted 2 lines
-@@ -2285,7 +2445,11 @@
- =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0=
=C2=A0 n_channels++;
Quoted 2 lines
- =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 if (!n_channels) {
- =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0=
=C2=A0 err =3D -EINVAL;
Quoted 2 lines
-+#if (
LINUX_VERSION_CODE<KERNEL_VERSION(2,6,30))
-+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0goto out_unlock;
Quoted 2 lines
-+#else
- =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0=
=C2=A0 goto out;
Quoted 4 lines
-+#endif
- =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 }
- =C2=A0 =C2=A0 =C2=A0 } else {
- =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 for (band =3D 0; b=
and < IEEE80211_NUM_BANDS; band++)
Quoted 4 lines
-@@ -2299,7 +2463,11 @@
compat/compat.diff +0
-3- - =C2=A0 =C2=A0 =C2=A0 if (n_ssids > wiphy->max_scan_ssids) { - =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 err =3D -EINVAL;
compat/compat.diff
Quoted 10 lines
compat/compat.diff +0
-10-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)) -+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0goto out_unlock; -+#else - =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 goto out; -+#endif - =C2=A0 =C2=A0 =C2=A0 } - - =C2=A0 =C2=A0 =C2=A0 if (info->attrs[NL80211_ATTR_IE]) -@@ -2313,7 +2481,11 @@ - =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0=
=C2=A0 + ie_len, GFP_KERNEL);
Quoted 10 lines
- =C2=A0 =C2=A0 =C2=A0 if (!request) {
- =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 err =3D-ENOMEM; -+#if (LINUX_VERSION_CODE<KERNEL_VERSION(2,6,30))
-+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0gotoout_unlock; -+#else
- =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 goto out; -+#endif
- =C2=A0 =C2=A0 =C2=A0 }
-
- =C2=A0 =C2=A0 =C2=A0request->channels=3D (void *)((char *)request=
+ sizeof(*request));
Quoted 2 lines
-@@ -2384,6 +2556,10 @@
- =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0drv->scan_req=3D =
NULL;
Quoted 3 lines
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 goto
out_unlock; +@@ -2424,7 +2508,9 @@
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0kfree(request)=
;
Quoted 10 lines
=C2=A0 =C2=A0 =C2=A0 =C2=A0}
+ =C2=A0out_unlock:
=C2=A0+#if (LINUX_VERSION_CODE<KERNEL_VERSION(2,6,30)) -+out_unlock:
-+ =C2=A0 =C2=A0 =C2=A0rtnl_unlock();
+ =C2=A0 =C2=A0 =C2=A0rtnl_unlock(); =C2=A0+#endif
=C2=A0 out:
=C2=A0 =C2=A0 =C2=A0 =C2=A0cfg80211_put_dev(drv);
--
To unsubscribe from this list: send the line "unsubscribe linux-wireles= s" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi,
this patch does not look very nice.
The part of compat.diff for net/wireless/nl80211.c was for Johannes commit b8120417fc6ee609430c5436fe9ed07ffc2e63ba in wireless-testing. This patch was reverted in commit 4d8bfeff50982158c4ec4ed6c38388ba3bfc9c9c. The whole patch for nl80211.c is useless for kernel older than 2.6.30 and will case problems on this kernel. (I know it does not exist for now ;-) ).
In my opinion it will be the best to delete the part for nl80211.c from compat.diff for now.
Hauke
Quoted 9 lines · Luis R. Rodriguez
Quoted 4 lines · pat-lkml
This updates compat.diff for wireless-testing commit
68a4ef439847ed4bc07f17d398fe06c34f15d5daSigned-off-by Pat Erley<[email protected]>Thanks applied, now just waiting for git pull to finish on wireless.kernel.org.
Luis
Quoted 11 lines · Hauke Mehrtens
Hi,
this patch does not look very nice.
The part of compat.diff fornet/wireless/nl80211.cwas for Johannes commitb8120417fc6ee609430c5436fe9ed07ffc2e63bain wireless-testing. This patch was reverted in commit4d8bfeff50982158c4ec4ed6c38388ba3bfc9c9c. The whole patch fornl80211.cis useless for kernel older than 2.6.30 and will case problems on this kernel. (I know it does not exist for now ;-) ).
In my opinion it will be the best to delete the part fornl80211.cfrom compat.diff for now.
I should have reviewed this more carefully, thought it did that :)
Luis