Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
David S. Miller [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>

26 files changed:
1  2 
MAINTAINERS
drivers/net/ethernet/micrel/ksz884x.c
drivers/net/usb/cdc_ncm.c
drivers/net/usb/smsc95xx.c
drivers/net/vxlan.c
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
drivers/net/wireless/iwlwifi/dvm/main.c
drivers/net/wireless/iwlwifi/pcie/rx.c
net/batman-adv/soft-interface.c
net/batman-adv/translation-table.c
net/bluetooth/hci_core.c
net/bluetooth/mgmt.c
net/bluetooth/smp.c
net/core/dev.c
net/ipv4/ip_vti.c
net/ipv4/tcp.c
net/ipv4/tcp_input.c
net/ipv6/ipv6_sockglue.c
net/mac80211/cfg.c
net/mac80211/ieee80211_i.h
net/mac80211/main.c
net/mac80211/scan.c
net/mac80211/sta_info.c
net/mac80211/status.c
net/mac80211/tx.c
net/mac80211/util.c

diff --cc MAINTAINERS
Simple merge
Simple merge
@@@ -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;
  
Simple merge
Simple merge
Simple merge
@@@ -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.
Simple merge
Simple merge
Simple merge
diff --cc net/core/dev.c
Simple merge
Simple merge
diff --cc net/ipv4/tcp.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge