Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0e43182c authored Aug 24, 2011 by David S. Miller

Merge branch 'batman-adv/next' of git://git.open-mesh.org/linux-merge

parents 131ea667 a943cac1

Documentation/ABI/testing/sysfs-class-net-mesh

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -22,6 +22,14 @@ Description:
	mesh will be fragmented or silently discarded if the		mesh will be fragmented or silently discarded if the
	packet size exceeds the outgoing interface MTU.		packet size exceeds the outgoing interface MTU.

			What: /sys/class/net/<mesh_iface>/mesh/ap_isolation
			Date: May 2011
			Contact: Antonio Quartulli <ordex@autistici.org>
			Description:
			Indicates whether the data traffic going from a
			wireless client to another wireless client will be
			silently dropped.

	What: /sys/class/net/<mesh_iface>/mesh/gw_bandwidth		What: /sys/class/net/<mesh_iface>/mesh/gw_bandwidth
	Date: October 2010		Date: October 2010
	Contact: Marek Lindner <lindner_marek@yahoo.de>		Contact: Marek Lindner <lindner_marek@yahoo.de>

net/batman-adv/aggregation.h

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -28,8 +28,7 @@
	static inline int aggregated_packet(int buff_pos, int packet_len,		static inline int aggregated_packet(int buff_pos, int packet_len,
	int tt_num_changes)		int tt_num_changes)
	{		{
	int next_buff_pos = buff_pos + BAT_PACKET_LEN + (tt_num_changes *		int next_buff_pos = buff_pos + BAT_PACKET_LEN + tt_len(tt_num_changes);
	sizeof(struct tt_change));

	return (next_buff_pos <= packet_len) &&		return (next_buff_pos <= packet_len) &&
	(next_buff_pos <= MAX_AGGREGATION_BYTES);		(next_buff_pos <= MAX_AGGREGATION_BYTES);

net/batman-adv/bat_sysfs.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -380,6 +380,7 @@ static ssize_t store_gw_bwidth(struct kobject kobj, struct attribute attr,
	BAT_ATTR_BOOL(aggregated_ogms, S_IRUGO \| S_IWUSR, NULL);		BAT_ATTR_BOOL(aggregated_ogms, S_IRUGO \| S_IWUSR, NULL);
	BAT_ATTR_BOOL(bonding, S_IRUGO \| S_IWUSR, NULL);		BAT_ATTR_BOOL(bonding, S_IRUGO \| S_IWUSR, NULL);
	BAT_ATTR_BOOL(fragmentation, S_IRUGO \| S_IWUSR, update_min_mtu);		BAT_ATTR_BOOL(fragmentation, S_IRUGO \| S_IWUSR, update_min_mtu);
			BAT_ATTR_BOOL(ap_isolation, S_IRUGO \| S_IWUSR, NULL);
	static BAT_ATTR(vis_mode, S_IRUGO \| S_IWUSR, show_vis_mode, store_vis_mode);		static BAT_ATTR(vis_mode, S_IRUGO \| S_IWUSR, show_vis_mode, store_vis_mode);
	static BAT_ATTR(gw_mode, S_IRUGO \| S_IWUSR, show_gw_mode, store_gw_mode);		static BAT_ATTR(gw_mode, S_IRUGO \| S_IWUSR, show_gw_mode, store_gw_mode);
	BAT_ATTR_UINT(orig_interval, S_IRUGO \| S_IWUSR, 2 * JITTER, INT_MAX, NULL);		BAT_ATTR_UINT(orig_interval, S_IRUGO \| S_IWUSR, 2 * JITTER, INT_MAX, NULL);
	@@ -396,6 +397,7 @@ static struct bat_attribute *mesh_attrs[] = {
	&bat_attr_aggregated_ogms,		&bat_attr_aggregated_ogms,
	&bat_attr_bonding,		&bat_attr_bonding,
	&bat_attr_fragmentation,		&bat_attr_fragmentation,
			&bat_attr_ap_isolation,
	&bat_attr_vis_mode,		&bat_attr_vis_mode,
	&bat_attr_gw_mode,		&bat_attr_gw_mode,
	&bat_attr_orig_interval,		&bat_attr_orig_interval,

net/batman-adv/bitarray.c

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -97,12 +97,12 @@ static void bit_shift(unsigned long *seq_bits, int32_t n)
	(seq_bits[i - word_num - 1] >>		(seq_bits[i - word_num - 1] >>
	(WORD_BIT_SIZE-word_offset));		(WORD_BIT_SIZE-word_offset));
	/* and the upper part of the right half and shift it left to		/* and the upper part of the right half and shift it left to
	* it's position */		* its position */
	/* for our example that would be: word[0] = 9800 + 0076 =		/* for our example that would be: word[0] = 9800 + 0076 =
	* 9876 */		* 9876 */
	}		}
	/* now for our last word, i==word_num, we only have the it's "left"		/* now for our last word, i==word_num, we only have its "left" half.
	* half. that's the 1000 word in our example.*/		* that's the 1000 word in our example.*/

	seq_bits[i] = (seq_bits[i - word_num] << word_offset);		seq_bits[i] = (seq_bits[i - word_num] << word_offset);

net/batman-adv/gateway_client.c

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -532,14 +532,14 @@ static bool is_type_dhcprequest(struct sk_buff *skb, int header_len)
	pkt_len -= header_len + DHCP_OPTIONS_OFFSET + 1;		pkt_len -= header_len + DHCP_OPTIONS_OFFSET + 1;

	/* Access the dhcp option lists. Each entry is made up by:		/* Access the dhcp option lists. Each entry is made up by:
	* - octect 1: option type		* - octet 1: option type
	* - octect 2: option data len (only if type != 255 and 0)		* - octet 2: option data len (only if type != 255 and 0)
	* - octect 3: option data */		* - octet 3: option data */
	while (*p != 255 && !ret) {		while (*p != 255 && !ret) {
	/* p now points to the first octect: option type */		/* p now points to the first octet: option type */
	if (*p == 53) {		if (*p == 53) {
	/* type 53 is the message type option.		/* type 53 is the message type option.
	* Jump the len octect and go to the data octect */		* Jump the len octet and go to the data octet */
	if (pkt_len < 2)		if (pkt_len < 2)
	goto out;		goto out;
	p += 2;		p += 2;