The annotated tag, v2.6.36-rc8 has been created
at 7619e63f48822b2c68d0e108677340573873fb93 (tag)
tagging cd07202cc8262e1669edff0d97715f3dd9260917 (commit)
replaces v2.6.36-rc7
tagged by Linus Torvalds
on Thu Oct 14 16:26:58 2010 -0700
- Shortlog ------------------------------------------------------------
Linux 2.6.36-rc8
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
iEYEABECAAYFAky3kccACgkQF3YsRnbiHLugogCgpCdvxRBUShKgWyHfdMdvLgmh
Md8An1uyfLsMEcddN6oAyj9XLh/RzcQ/
=pfwZ
-----END PGP SIGNATURE-----
-----------------------------------------------------------------------
--
linux integration
The following commit has been merged in the master branch:
commit 89cf6639508ab9ebe4c886276a80978b45407abf
Author: Sven Eckelmann <sven.eckelmann(a)gmx.de>
Date: Fri Oct 15 15:47:52 2010 +0000
batman-adv: Add batman-adv sysfs ABI documentation
The kernel requires to have all files in /sys documented and updated
when new files are added.
batman-adv has two important classes of files: one class for each mesh
device and one for a directory in all normal netdevice folders.
Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de>
diff --git a/sysfs-class-net-batman-adv b/sysfs-class-net-batman-adv
new file mode 100644
index 0000000..38dd762
--- /dev/null
+++ b/sysfs-class-net-batman-adv
@@ -0,0 +1,14 @@
+
+What: /sys/class/net/<iface>/batman-adv/mesh_iface
+Date: May 2010
+Contact: Marek Lindner <lindner_marek(a)yahoo.de>
+Description:
+ The /sys/class/net/<iface>/batman-adv/mesh_iface file
+ displays the batman mesh interface this <iface>
+ currently is associated with.
+
+What: /sys/class/net/<iface>/batman-adv/iface_status
+Date: May 2010
+Contact: Marek Lindner <lindner_marek(a)yahoo.de>
+Description:
+ Indicates the status of <iface> as it is seen by batman.
diff --git a/sysfs-class-net-mesh b/sysfs-class-net-mesh
new file mode 100644
index 0000000..5aa1912
--- /dev/null
+++ b/sysfs-class-net-mesh
@@ -0,0 +1,33 @@
+
+What: /sys/class/net/<mesh_iface>/mesh/aggregated_ogms
+Date: May 2010
+Contact: Marek Lindner <lindner_marek(a)yahoo.de>
+Description:
+ Indicates whether the batman protocol messages of the
+ mesh <mesh_iface> shall be aggregated or not.
+
+What: /sys/class/net/<mesh_iface>/mesh/bonding
+Date: June 2010
+Contact: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de>
+Description:
+ Indicates whether the data traffic going through the
+ mesh will be sent using multiple interfaces at the
+ same time (if available).
+
+What: /sys/class/net/<mesh_iface>/mesh/orig_interval
+Date: May 2010
+Contact: Marek Lindner <lindner_marek(a)yahoo.de>
+Description:
+ Defines the interval in milliseconds in which batman
+ sends its protocol messages.
+
+What: /sys/class/net/<mesh_iface>/mesh/vis_mode
+Date: May 2010
+Contact: Marek Lindner <lindner_marek(a)yahoo.de>
+Description:
+ Each batman node only maintains information about its
+ own local neighborhood, therefore generating graphs
+ showing the topology of the entire mesh is not easily
+ feasible without having a central instance to collect
+ the local topologies from all nodes. This file allows
+ to activate the collecting (server) mode.
--
batman-adv
The following commit has been merged in the next branch:
commit c5b47959c2acfdb87521aac536a084606632a972
Author: Linus Lüssing <linus.luessing(a)web.de>
Date: Tue Oct 12 09:56:38 2010 +0000
batman-adv: Fix wrongly formatted %pM in bat_dbg()
bat_dbg() invokes debug_log() which invokes the kernel's vscnprintf(),
which invokes the kernel's vsnprintf(), and not the customized
bat_vsnprintf(), which backports the %pM to older kernel versions!
Therefore this commit ports a customized vscnprintf() to bat_printk.c,
too, making mac addresses being displayed correctly with bat_dbg()
again.
Signed-off-by: Linus Lüssing <linus.luessing(a)web.de>
Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de>
Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de>
diff --git a/bat_printk.c b/bat_printk.c
index 4a02d7e..6615876 100644
--- a/bat_printk.c
+++ b/bat_printk.c
@@ -838,6 +838,31 @@ static int bat_vsnprintf(char *buf, size_t size, const char *fmt, va_list args)
}
/**
+ * bat_vscnprintf - Format a string and place it in a buffer
+ * @buf: The buffer to place the result into
+ * @size: The size of the buffer, including the trailing null space
+ * @fmt: The format string to use
+ * @args: Arguments for the format string
+ *
+ * The return value is the number of characters which have been written into
+ * the @buf not including the trailing '\0'. If @size is <= 0 the function
+ * returns 0.
+ *
+ * Call this function if you are already dealing with a va_list.
+ * You probably want scnprintf() instead.
+ *
+ * See the vsnprintf() documentation for format string extensions over C99.
+ */
+int bat_vscnprintf(char *buf, size_t size, const char *fmt, va_list args)
+{
+ int i;
+
+ i = bat_vsnprintf(buf, size, fmt, args);
+
+ return (i >= size) ? (size - 1) : i;
+}
+
+/**
* bat_printk - print a kernel message using extra %p formatting
* strings, forward compatible with kernel version 2.6.31 printk, minus
* *p[sS].
diff --git a/compat.h b/compat.h
index 514e05a..f43ae85 100644
--- a/compat.h
+++ b/compat.h
@@ -252,6 +252,9 @@ next_sibling:
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29)
+int bat_vscnprintf(char *buf, size_t size, const char *fmt, va_list args);
+#define vscnprintf bat_vscnprintf
+
asmlinkage int bat_printk(const char *fmt, ...);
#define printk bat_printk
--
batman-adv
The following commit has been merged in the master branch:
commit 3ae241d0ae30f1a719dce9c97e318c01a060a838
Author: Sven Eckelmann <sven.eckelmann(a)gmx.de>
Date: Tue Oct 12 10:00:08 2010 +0000
batman-adv: Keep line length to 80 chars
48628bb9419fb5b01a26ca995465d1aded1e47ed added a line over the limit of
80 chars. This should be avoided according to the kernel
Documentation/CodingStyle.
Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de>
diff --git a/soft-interface.c b/soft-interface.c
index 22fe548..683ec5f 100644
--- a/soft-interface.c
+++ b/soft-interface.c
@@ -220,7 +220,8 @@ int softif_neigh_seq_print_text(struct seq_file *seq, void *offset)
return 0;
}
-static void softif_batman_recv(struct sk_buff *skb, struct net_device *dev, short vid)
+static void softif_batman_recv(struct sk_buff *skb, struct net_device *dev,
+ short vid)
{
struct bat_priv *bat_priv = netdev_priv(dev);
struct ethhdr *ethhdr = (struct ethhdr *)skb->data;
--
batman-adv
The following commit has been merged in the master branch:
commit af22dfdd8e4266467c1998d9ea65f93a82aa7e18
Author: Linus Lüssing <linus.luessing(a)web.de>
Date: Tue Oct 12 09:56:38 2010 +0000
batman-adv: Fix wrongly formatted %pM in bat_dbg()
bat_dbg() invokes debug_log() which invokes the kernel's vscnprintf(),
which invokes the kernel's vsnprintf(), and not the customized
bat_vsnprintf(), which backports the %pM to older kernel versions!
Therefore this commit ports a customized vscnprintf() to bat_printk.c,
too, making mac addresses being displayed correctly with bat_dbg()
again.
Signed-off-by: Linus Lüssing <linus.luessing(a)web.de>
Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de>
diff --git a/bat_printk.c b/bat_printk.c
index 4a02d7e..6615876 100644
--- a/bat_printk.c
+++ b/bat_printk.c
@@ -838,6 +838,31 @@ static int bat_vsnprintf(char *buf, size_t size, const char *fmt, va_list args)
}
/**
+ * bat_vscnprintf - Format a string and place it in a buffer
+ * @buf: The buffer to place the result into
+ * @size: The size of the buffer, including the trailing null space
+ * @fmt: The format string to use
+ * @args: Arguments for the format string
+ *
+ * The return value is the number of characters which have been written into
+ * the @buf not including the trailing '\0'. If @size is <= 0 the function
+ * returns 0.
+ *
+ * Call this function if you are already dealing with a va_list.
+ * You probably want scnprintf() instead.
+ *
+ * See the vsnprintf() documentation for format string extensions over C99.
+ */
+int bat_vscnprintf(char *buf, size_t size, const char *fmt, va_list args)
+{
+ int i;
+
+ i = bat_vsnprintf(buf, size, fmt, args);
+
+ return (i >= size) ? (size - 1) : i;
+}
+
+/**
* bat_printk - print a kernel message using extra %p formatting
* strings, forward compatible with kernel version 2.6.31 printk, minus
* *p[sS].
diff --git a/compat.h b/compat.h
index d59d709..5c02b44 100644
--- a/compat.h
+++ b/compat.h
@@ -256,6 +256,9 @@ next_sibling:
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29)
+int bat_vscnprintf(char *buf, size_t size, const char *fmt, va_list args);
+#define vscnprintf bat_vscnprintf
+
asmlinkage int bat_printk(const char *fmt, ...);
#define printk bat_printk
--
batman-adv