author | David S. Miller <davem@davemloft.net> | |
Sun, 18 Nov 2012 03:00:43 +0000 (22:00 -0500) | ||
committer | David S. Miller <davem@davemloft.net> | |
Sun, 18 Nov 2012 03:00:43 +0000 (22:00 -0500) |
Minor line offset auto-merges.
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
26 files changed:
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/net/ethernet/micrel/ksz884x.c
Simple merge
diff --cc drivers/net/usb/cdc_ncm.c
index ddc7b8880f60894a1470c504d49f06aee0c33910,74fab1a4015657b52bd5b4c690990120171dc509..d38bc20a60e2e63fd2d056b9070cdce57f524090
/* 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 drivers/net/usb/smsc95xx.c
Simple merge
diff --cc drivers/net/vxlan.c
Simple merge
Simple merge
diff --cc drivers/net/wireless/iwlwifi/dvm/main.c
Simple merge
diff --cc drivers/net/wireless/iwlwifi/pcie/rx.c
Simple merge
diff --cc net/batman-adv/soft-interface.c
Simple merge
diff --cc net/batman-adv/translation-table.c
index 9f5705fcf4268c5796a76c8b1302e3a6ae37c915,baae71585804313ff406aad0ab7f04b0b7daa189..582f13405df9286bc752b633ed61a3b9244d545f
/* 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.
diff --cc net/bluetooth/hci_core.c
Simple merge
diff --cc net/bluetooth/mgmt.c
Simple merge
diff --cc net/bluetooth/smp.c
Simple merge
diff --cc net/core/dev.c
Simple merge
diff --cc net/ipv4/ip_vti.c
Simple merge
diff --cc net/ipv4/tcp.c
Simple merge
diff --cc net/ipv4/tcp_input.c
Simple merge
diff --cc net/ipv6/ipv6_sockglue.c
Simple merge
diff --cc net/mac80211/cfg.c
Simple merge
diff --cc net/mac80211/ieee80211_i.h
Simple merge
diff --cc net/mac80211/main.c
Simple merge
diff --cc net/mac80211/scan.c
Simple merge
diff --cc net/mac80211/sta_info.c
Simple merge
diff --cc net/mac80211/status.c
Simple merge
diff --cc net/mac80211/tx.c
Simple merge
diff --cc net/mac80211/util.c
Simple merge