Re: [B.A.T.M.A.N.] [PATCH net] Bug fix for batman-adv 2012-07-06

On Fri, Jul 06, 2012 at 12:48:33 +0200, Antonio Quartulli wrote:

here I have a fix intended for net/linux-3.5.

 ...


Hello David,

here you have our instructions to resolve the conflicts that you will hit while
merging net into net-next:




Conflict 1 (bridge_loop_avoidance.c):
<<<<<<<
int batadv_bla_rx(struct batadv_priv *bat_priv, struct sk_buff *skb, short vid)
=======
int bla_rx(struct bat_priv *bat_priv, struct sk_buff *skb, short vid,
	   bool is_bcast)

quoted

quoted

quoted

quoted

quoted

quoted

resolves to:
int batadv_bla_rx(struct batadv_priv *bat_priv, struct sk_buff *skb, short vid,
		  bool is_bcast)

Conflict 2 (bridge_loop_avoidance.h):
<<<<<<<
int batadv_bla_rx(struct batadv_priv *bat_priv, struct sk_buff *skb, short vid);
int batadv_bla_tx(struct batadv_priv *bat_priv, struct sk_buff *skb, short vid);
int batadv_bla_is_backbone_gw(struct sk_buff *skb,
			      struct batadv_orig_node *orig_node, int hdr_size);
int batadv_bla_claim_table_seq_print_text(struct seq_file *seq, void *offset);
int batadv_bla_is_backbone_gw_orig(struct batadv_priv *bat_priv, uint8_t *orig);
int batadv_bla_check_bcast_duplist(struct batadv_priv *bat_priv,
				   struct batadv_bcast_packet *bcast_packet,
				   int hdr_size);
void batadv_bla_update_orig_address(struct batadv_priv *bat_priv,
				    struct batadv_hard_iface *primary_if,
				    struct batadv_hard_iface *oldif);
int batadv_bla_init(struct batadv_priv *bat_priv);
void batadv_bla_free(struct batadv_priv *bat_priv);
=======
int bla_rx(struct bat_priv *bat_priv, struct sk_buff *skb, short vid,
	   bool is_bcast);
int bla_tx(struct bat_priv *bat_priv, struct sk_buff *skb, short vid);
int bla_is_backbone_gw(struct sk_buff *skb,
		       struct orig_node *orig_node, int hdr_size);
int bla_claim_table_seq_print_text(struct seq_file *seq, void *offset);
int bla_is_backbone_gw_orig(struct bat_priv *bat_priv, uint8_t *orig);
int bla_check_bcast_duplist(struct bat_priv *bat_priv,
			    struct bcast_packet *bcast_packet, int hdr_size);
void bla_update_orig_address(struct bat_priv *bat_priv,
			     struct hard_iface *primary_if,
			     struct hard_iface *oldif);
int bla_init(struct bat_priv *bat_priv);
void bla_free(struct bat_priv *bat_priv);

quoted

quoted

quoted

quoted

quoted

quoted

resolves to:
int batadv_bla_rx(struct batadv_priv *bat_priv, struct sk_buff *skb, short vid,
		  bool is_bcast);
int batadv_bla_tx(struct batadv_priv *bat_priv, struct sk_buff *skb, short vid);
int batadv_bla_is_backbone_gw(struct sk_buff *skb,
			      struct batadv_orig_node *orig_node, int hdr_size);
int batadv_bla_claim_table_seq_print_text(struct seq_file *seq, void *offset);
int batadv_bla_is_backbone_gw_orig(struct batadv_priv *bat_priv, uint8_t *orig);
int batadv_bla_check_bcast_duplist(struct batadv_priv *bat_priv, 
				   struct batadv_bcast_packet *bcast_packet,
				   int hdr_size);
void batadv_bla_update_orig_address(struct batadv_priv *bat_priv,
				    struct batadv_hard_iface *primary_if,
				    struct batadv_hard_iface *oldif);
int batadv_bla_init(struct batadv_priv *bat_priv);
void batadv_bla_free(struct batadv_priv *bat_priv);


Conflict 3 (bridge_loop_avoidance.h):
<<<<<<<
static inline int batadv_bla_rx(struct batadv_priv *bat_priv,
				struct sk_buff *skb, short vid)
=======                         
static inline int bla_rx(struct bat_priv *bat_priv, struct sk_buff *skb,
			 short vid, bool is_bcast)

quoted

quoted

quoted

quoted

quoted

quoted

resolves to:
static inline int batadv_bla_rx(struct batadv_priv *bat_priv,
				struct sk_buff *skb, short vid, bool is_bcast)

Conflict 4 (soft-interface.c):
<<<<<<<
	__be16 ethertype = __constant_htons(BATADV_ETH_P_BATMAN);
=======
	bool is_bcast;

	is_bcast = (batadv_header->packet_type == BAT_BCAST);

quoted

quoted

quoted

quoted

quoted

quoted

resolves to:
	bool is_bcast;
	__be16 ethertype = __constant_htons(BATADV_ETH_P_BATMAN);

	is_bcast = (batadv_header->packet_type == BATADV_BCAST);


Conflict 5 (soft-interface.c):
<<<<<<<
	if (batadv_bla_rx(bat_priv, skb, vid))
=======
	if (bla_rx(bat_priv, skb, vid, is_bcast))

quoted

quoted

quoted

quoted

quoted

quoted

resolves to:
	if (batadv_bla_rx(bat_priv, skb, vid, is_bcast))


Wrong merge by git (soft-interface.c):
line 270 must look like this:
	struct batadv_header *batadv_header = (struct batadv_header *)skb->data;




-- 
Antonio Quartulli

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