batman-adv merge-conflict

batman-adv merge-conflict

[Antonio Quartulli]

[-- Attachment #1: Type: text/plain, Size: 2490 bytes --]

Hi David,

here are the instructions to resolve the conflicts you will get while merging
net into net-next.


In net/batman-adv/routing.c

++<<<<<<< HEAD
 +static int batadv_check_unicast_packet(struct sk_buff *skb, int hdr_size)
++=======
+ static int batadv_check_unicast_packet(struct batadv_priv *bat_priv,
+ 				       struct sk_buff *skb, int hdr_size)
++>>>>>>> maint

Resolves as:
/**
 * batadv_check_unicast_packet - Check for malformed unicast packets
 * @skb: packet to check
 * @hdr_size: size of header to pull
 *
 * Check for short header and bad addresses in given packet. Returns negative
 * value when check fails and 0 otherwise. The negative value depends on the
 * reason: -ENODATA for bad header, -EBADR for broadcast destination or source,
 * and -EREMOTE for non-local (other host) destination.
 */
static int batadv_check_unicast_packet(struct batadv_priv *bat_priv,
				       struct sk_buff *skb, int hdr_size)
===============================================================================

++<<<<<<< HEAD
 +	if (!batadv_is_my_mac(ethhdr->h_dest))
 +		return -EREMOTE;
++=======
+ 	if (!batadv_is_my_mac(bat_priv, ethhdr->h_dest))
+ 		return -1;
++>>>>>>> maint

Resolves as:
if (!batadv_is_my_mac(bat_priv, ethhdr->h_dest))
	return -EREMOTE;
===============================================================================

++<<<<<<< HEAD
 +	/* function returns -EREMOTE for promiscuous packets */
 +	check = batadv_check_unicast_packet(skb, hdr_size);
 +
 +	/* Even though the packet is not for us, we might save it to use for
 +	 * decoding a later received coded packet
 +	 */
 +	if (check == -EREMOTE)
 +		batadv_nc_skb_store_sniffed_unicast(bat_priv, skb);
 +
 +	if (check < 0)
++=======
+ 	if (batadv_check_unicast_packet(bat_priv, skb, hdr_size) < 0)
++>>>>>>> maint

Resolves as:
/* function returns -EREMOTE for promiscuous packets */
check = batadv_check_unicast_packet(bat_priv, skb, hdr_size);

/* Even though the packet is not for us, we might save it to use for
 * decoding a later received coded packet
 */
if (check == -EREMOTE)
	batadv_nc_skb_store_sniffed_unicast(bat_priv, skb);

if (check < 0)
===============================================================================


I'm now going to send a pull request to fix some compile issues generated by the
merge.


Cheers,


-- 
Antonio Quartulli

..each of us alone is worth nothing..
Ernesto "Che" Guevara

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: batman-adv merge-conflict

[David Miller]

From: Antonio Quartulli <ordex@autistici.org>
Date: Fri, 19 Apr 2013 10:26:51 +0200

> here are the instructions to resolve the conflicts you will get
> while merging net into net-next.

Thanks.

> I'm now going to send a pull request to fix some compile issues
> generated by the merge.

We never fix such breakage separately.

We put these kinds of things in the merge commit, so proper bisecting
is possible over the merge.  And that's what I did just now.

Re: batman-adv merge-conflict

[Antonio Quartulli]

[-- Attachment #1: Type: text/plain, Size: 699 bytes --]

On Mon, Apr 22, 2013 at 08:40:24PM -0400, David Miller wrote:
> From: Antonio Quartulli <ordex@autistici.org>
> Date: Fri, 19 Apr 2013 10:26:51 +0200
> 
> > here are the instructions to resolve the conflicts you will get
> > while merging net into net-next.
> 
> Thanks.
> 
> > I'm now going to send a pull request to fix some compile issues
> > generated by the merge.
> 
> We never fix such breakage separately.
> 
> We put these kinds of things in the merge commit, so proper bisecting
> is possible over the merge.  And that's what I did just now.


Ok. Thanks a lot David!

Regards,

-- 
Antonio Quartulli

..each of us alone is worth nothing..
Ernesto "Che" Guevara

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]