The annotated tag, v3.4 has been created
at 27406e978f596a646b87941cba5247eb0ccc8916 (tag)
tagging 76e10d158efb6d4516018846f60c2ab5501900bc (commit)
replaces v3.4-rc7
tagged by Linus Torvalds
on Sun May 20 15:29:25 2012 -0700
- Shortlog ------------------------------------------------------------
Linux 3.4
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (GNU/Linux)
iQEcBAABAgAGBQJPuXBKAAoJEHm+PkMAQRiGzgwH/2F+JOth4pkcGvw0S2Sf1+MS
iNgYK08xOp/f5VbP8lOfTFjPhCwggSQrq+B2TF2bWYz6vmsQq1e5X319Lcy7cb9h
GV3HJRKuC38fxT1unXxY+oQYvIRNmNSGD2H1jrb6Ee3gd8tYZ77qxFGskx6sXos2
74fRiqXQ1AiEj9Sh+6XSYtRwxBfwdGu1RAtpykoZiPfD3+eq07Rhy+r75AtRLKue
lwHK03hMsRtevGftAFC2q76VVhOFa9EsZ3dMa2Fj1iOcRYEnGy7UnLrgqqyFk1he
l5ULsg8RPCUunBJuKdmYeIMAKc3ucSv+MuOWzGcYGsja3U6sJbdE+3TUPI3/OWE=
=8Z08
-----END PGP SIGNATURE-----
-----------------------------------------------------------------------
--
linux integration
The following commit has been merged in the master branch:
commit 551c540ac5c716a2dd21095e86ec56f1f4d6994a
Author: Sven Eckelmann <sven(a)narfation.org>
Date: Wed May 16 20:23:25 2012 +0200
batman-adv: Use typedef instead of define for type dat_addr_t
This wrong type definition was introduced in
a34852f63a694e3f35eb155101120a3c6f4dd6ee
Signed-off-by: Sven Eckelmann <sven(a)narfation.org>
diff --git a/types.h b/types.h
index 6f3d6f6..73aaef9 100644
--- a/types.h
+++ b/types.h
@@ -30,7 +30,7 @@
*
* *Please be careful: dat_addr_t must be UNSIGNED*
*/
-#define dat_addr_t uint16_t
+typedef uint16_t dat_addr_t;
#endif /* CONFIG_BATMAN_ADV_DAT */
--
batman-adv
The following commit has been merged in the master branch:
commit 34f20d6a6490fc2750ac0afac4121fd91499946e
Author: Sven Eckelmann <sven(a)narfation.org>
Date: Fri May 18 17:16:13 2012 +0200
batman-adv: Prefix bat_sysfs local static functions with batadv_
All non-static symbols of batman-adv were prefixed with batadv_ to avoid
collisions with other symbols of the kernel. Other symbols of batman-adv
should use the same prefix to keep the naming scheme consistent.
This was actually part of patch used to create the commit
98881e49493eb1a6ae2330d861386432064b2222.
Signed-off-by: Sven Eckelmann <sven(a)narfation.org>
This is the alternative version of this patch... that keeps the functionality
for ELP
bat_sysfs.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/bat_sysfs.c b/bat_sysfs.c
index 336a61d..07fde83 100644
--- a/bat_sysfs.c
+++ b/bat_sysfs.c
@@ -123,8 +123,9 @@ ssize_t batadv_show_##_name(struct kobject *kobj, \
#define BAT_ATTR_HIF_STORE_UINT(_name, _min, _max, _post_func) \
-ssize_t store_##_name(struct kobject *kobj, struct attribute *attr, \
- char *buff, size_t count) \
+ssize_t batadv_store_##_name(struct kobject *kobj, \
+ struct attribute *attr, char *buff, \
+ size_t count) \
{ \
struct net_device *net_dev = batadv_kobj_to_netdev(kobj); \
struct hard_iface *hard_iface; \
@@ -142,8 +143,8 @@ ssize_t store_##_name(struct kobject *kobj, struct attribute *attr, \
}
#define BAT_ATTR_HIF_SHOW_UINT(_name) \
-ssize_t show_##_name(struct kobject *kobj, \
- struct attribute *attr, char *buff) \
+ssize_t batadv_show_##_name(struct kobject *kobj, \
+ struct attribute *attr, char *buff) \
{ \
struct net_device *net_dev = batadv_kobj_to_netdev(kobj); \
struct hard_iface *hard_iface; \
--
batman-adv