From: David S. Miller <davem@davemloft.net>
Date: Sun, 18 Nov 2012 03:00:43 +0000 (-0500)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: firefly_0821_release~3680^2~1480^2~303
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=67f4efdce7d85282fbd5832cddc80a07eb89b6d6;p=firefly-linux-kernel-4.4.55.git

Merge git://git./linux/kernel/git/davem/net

Minor line offset auto-merges.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

67f4efdce7d85282fbd5832cddc80a07eb89b6d6
diff --cc drivers/net/usb/cdc_ncm.c
index ddc7b8880f60,74fab1a40156..d38bc20a60e2
--- a/drivers/net/usb/cdc_ncm.c
+++ b/drivers/net/usb/cdc_ncm.c
@@@ -437,13 -537,15 +437,15 @@@ advance
  
  	/* check if we got everything */
  	if ((ctx->control == NULL) || (ctx->data == NULL) ||
 -	    (ctx->ether_desc == NULL) || (ctx->control != intf))
 +	    ((!ctx->mbim_desc) && ((ctx->ether_desc == NULL) || (ctx->control != intf))))
  		goto error;
  
- 	/* claim interfaces, if any */
- 	temp = usb_driver_claim_interface(driver, ctx->data, dev);
- 	if (temp)
- 		goto error;
+ 	/* claim data interface, if different from control */
+ 	if (ctx->data != ctx->control) {
+ 		temp = usb_driver_claim_interface(driver, ctx->data, dev);
+ 		if (temp)
+ 			goto error;
+ 	}
  
  	iface_no = ctx->data->cur_altsetting->desc.bInterfaceNumber;
  
diff --cc net/batman-adv/translation-table.c
index 9f5705fcf426,baae71585804..582f13405df9
--- a/net/batman-adv/translation-table.c
+++ b/net/batman-adv/translation-table.c
@@@ -859,8 -767,14 +859,14 @@@ int batadv_tt_global_add(struct batadv_
  		/* if the client was temporary added before receiving the first
  		 * OGM announcing it, we have to clear the TEMP flag
  		 */
 -		tt_global_entry->common.flags &= ~BATADV_TT_CLIENT_TEMP;
 +		common->flags &= ~BATADV_TT_CLIENT_TEMP;
  
+ 		/* the change can carry possible "attribute" flags like the
+ 		 * TT_CLIENT_WIFI, therefore they have to be copied in the
+ 		 * client entry
+ 		 */
+ 		tt_global_entry->common.flags |= flags;
+ 
  		/* If there is the BATADV_TT_CLIENT_ROAM flag set, there is only
  		 * one originator left in the list and we previously received a
  		 * delete + roaming change for this originator.